Merge head

[pw-darwin.git] / chpass / chpass.h

diff --git a/chpass/chpass.h b/chpass/chpass.h
index b78b85e0441f4566a0f6b5938bb8b896f007c0c1..fd3a8390378e094984c30482abf21573e44acd54 100644 (file)
--- a/chpass/chpass.h
+++ b/chpass/chpass.h
@@ -48,7 +48,7 @@ typedef struct _entry {
        int (*func)(char *, struct passwd *, struct _entry *);
        int restricted;
        size_t len;
-       char *except, *save;
+       const char *except, *save;
 } ENTRY;
 
 /* Field numbers. */
@@ -64,7 +64,8 @@ extern int master_mode;
 
 int     atot(char *, time_t *);
 struct passwd *edit(const char *, struct passwd *);
-char    *ok_shell(char *);
+int      ok_shell(char *);
+char    *dup_shell(char *);
 int     p_change(char *, struct passwd *, ENTRY *);
 int     p_class(char *, struct passwd *, ENTRY *);
 int     p_expire(char *, struct passwd *, ENTRY *);
@@ -72,7 +73,6 @@ int    p_gecos(char *, struct passwd *, ENTRY *);
 int     p_gid(char *, struct passwd *, ENTRY *);
 int     p_hdir(char *, struct passwd *, ENTRY *);
 int     p_login(char *, struct passwd *, ENTRY *);
-int     p_login(char *, struct passwd *, ENTRY *);
 int     p_passwd(char *, struct passwd *, ENTRY *);
 int     p_shell(char *, struct passwd *, ENTRY *);
 int     p_uid(char *, struct passwd *, ENTRY *);