diff options
| -rw-r--r-- | vtysh/ChangeLog | 5 | ||||
| -rw-r--r-- | vtysh/vtysh_user.c | 26 |
2 files changed, 18 insertions, 13 deletions
diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog index 16434cf3..a2b39625 100644 --- a/vtysh/ChangeLog +++ b/vtysh/ChangeLog @@ -1,3 +1,8 @@ +2005-07-12 Christian Hammers <ch@debian.org> + + * vtysh_user.c: rename struct user to struct vtysh_user to avoid + clashes with sys/user.h on ARM. + 2005-04-07 Hasso Tepper <hasso at quagga.net> * Makefile.am: Remove rebuild4 target, it's not used any more by build diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c index 1ae2d8cb..e3015056 100644 --- a/vtysh/vtysh_user.c +++ b/vtysh/vtysh_user.c @@ -90,7 +90,7 @@ vtysh_pam (const char *user) } #endif /* USE_PAM */ -struct user +struct vtysh_user { char *name; u_char nopassword; @@ -98,26 +98,26 @@ struct user struct list *userlist; -struct user * +struct vtysh_user * user_new () { - struct user *user; - user = XMALLOC (0, sizeof (struct user)); - memset (user, 0, sizeof (struct user)); + struct vtysh_user *user; + user = XMALLOC (0, sizeof (struct vtysh_user)); + memset (user, 0, sizeof (struct vtysh_user)); return user; } void -user_free (struct user *user) +user_free (struct vtysh_user *user) { XFREE (0, user); } -struct user * +struct vtysh_user * user_lookup (const char *name) { struct listnode *node, *nnode; - struct user *user; + struct vtysh_user *user; for (ALL_LIST_ELEMENTS (userlist, node, nnode, user)) { @@ -131,7 +131,7 @@ void user_config_write () { struct listnode *node, *nnode; - struct user *user; + struct vtysh_user *user; for (ALL_LIST_ELEMENTS (userlist, node, nnode, user)) { @@ -140,10 +140,10 @@ user_config_write () } } -struct user * +struct vtysh_user * user_get (const char *name) { - struct user *user; + struct vtysh_user *user; user = user_lookup (name); if (user) return user; @@ -162,7 +162,7 @@ DEFUN (username_nopassword, "\n" "\n") { - struct user *user; + struct vtysh_user *user; user = user_get (argv[0]); user->nopassword = 1; return CMD_SUCCESS; @@ -171,7 +171,7 @@ DEFUN (username_nopassword, int vtysh_auth () { - struct user *user; + struct vtysh_user *user; struct passwd *passwd; passwd = getpwuid (geteuid ()); |