Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / vtysh / vtysh_user.c

diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c
index dcf8ca0470f7081038663d2a32daa35352445aeb..a0667acc7ed8ce942ee71206ec32b6a9a9e3dbc8 100644 (file)
--- a/vtysh/vtysh_user.c
+++ b/vtysh/vtysh_user.c
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* User authentication for vtysh.
  * Copyright (C) 2000 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -62,35 +47,24 @@ static int vtysh_pam(const char *user)
 
        /* Start PAM. */
        ret = pam_start(FRR_PAM_NAME, user, &conv, &pamh);
-       /* printf ("ret %d\n", ret); */
 
        /* Is user really user? */
        if (ret == PAM_SUCCESS)
                ret = pam_authenticate(pamh, 0);
-/* printf ("ret %d\n", ret); */
 
-#if 0
-  /* Permitted access? */
-  if (ret == PAM_SUCCESS)
-    ret = pam_acct_mgmt (pamh, 0);
-  printf ("ret %d\n", ret);
+       if (ret != PAM_SUCCESS)
+               fprintf(stderr, "vtysh_pam: Failure to initialize pam: %s(%d)",
+                       pam_strerror(pamh, ret), ret);
 
-  if (ret == PAM_AUTHINFO_UNAVAIL)
-    ret = PAM_SUCCESS;
-#endif /* 0 */
-
-/* This is where we have been authorized or not. */
-#ifdef DEBUG
-       if (ret == PAM_SUCCESS)
-               printf("Authenticated\n");
-       else
-               printf("Not Authenticated\n");
-#endif /* DEBUG */
+       if (pam_acct_mgmt(pamh, 0) != PAM_SUCCESS)
+               fprintf(stderr, "%s: Failed in account validation: %s(%d)",
+                       __func__, pam_strerror(pamh, ret), ret);
 
        /* close Linux-PAM */
        if (pam_end(pamh, ret) != PAM_SUCCESS) {
                pamh = NULL;
-               fprintf(stderr, "vtysh_pam: failed to release authenticator\n");
+               fprintf(stderr, "vtysh_pam: failed to release authenticator: %s(%d)\n",
+                       pam_strerror(pamh, ret), ret);
                exit(1);
        }
 
@@ -130,7 +104,8 @@ void user_config_write(void)
 
        for (ALL_LIST_ELEMENTS(userlist, node, nnode, user)) {
                if (user->nopassword) {
-                       sprintf(line, "username %s nopassword", user->name);
+                       snprintf(line, sizeof(line), "username %s nopassword",
+                                user->name);
                        config_add_line(config_top, line);
                }
        }
@@ -162,6 +137,26 @@ DEFUN (vtysh_banner_motd_file,
        return cmd_banner_motd_file(argv[idx_file]->arg);
 }
 
+DEFUN (vtysh_banner_motd_line,
+       vtysh_banner_motd_line_cmd,
+       "banner motd line LINE...",
+       "Set banner\n"
+       "Banner for motd\n"
+       "Banner from an input\n"
+       "Text\n")
+{
+       int idx = 0;
+       char *motd;
+
+       argv_find(argv, argc, "LINE", &idx);
+       motd = argv_concat(argv, argc, idx);
+
+       cmd_banner_motd_line(motd);
+       XFREE(MTYPE_TMP, motd);
+
+       return CMD_SUCCESS;
+}
+
 DEFUN (username_nopassword,
        username_nopassword_cmd,
        "username WORD nopassword",
@@ -204,7 +199,7 @@ char *vtysh_get_home(void)
        struct passwd *passwd;
        char *homedir;
 
-       if ((homedir = getenv("HOME")) != 0)
+       if ((homedir = getenv("HOME")) != NULL)
                return homedir;
 
        /* Fallback if HOME is undefined */
@@ -218,4 +213,5 @@ void vtysh_user_init(void)
        userlist = list_new();
        install_element(CONFIG_NODE, &username_nopassword_cmd);
        install_element(CONFIG_NODE, &vtysh_banner_motd_file_cmd);
+       install_element(CONFIG_NODE, &vtysh_banner_motd_line_cmd);
 }