The pwdb function is only used once to check the database rename it

[pw-darwin.git] / chpass / table.c

diff --git a/chpass/table.c b/chpass/table.c
index eed097eebad816b24a8ea78674b251d820ffa451..a4918b4955b356e16e8883e0dbb860ed9caad232 100644 (file)
--- a/chpass/table.c
+++ b/chpass/table.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -31,35 +27,36 @@
  * SUCH DAMAGE.
  */
 
+#if 0
 #ifndef lint
-static char sccsid[] = "@(#)table.c    8.3 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)table.c      8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <stddef.h>
 #include "chpass.h"
 
-char e1[] = ": ";
-char e2[] = ":,";
-
 ENTRY list[] = {
-       { "login",              p_login,  1,   5, e1,   },
-       { "password",           p_passwd, 1,   8, e1,   },
-       { "uid",                p_uid,    1,   3, e1,   },
-       { "gid",                p_gid,    1,   3, e1,   },
-       { "class",              p_class,  1,   5, e1,   },
-       { "change",             p_change, 1,   6, NULL, },
-       { "expire",             p_expire, 1,   6, NULL, },
+       { "login",              p_login,  1,   5, ": ", NULL },
+       { "password",           p_passwd, 1,   8, ": ", NULL },
+       { "uid",                p_uid,    1,   3, ": ", NULL },
+       { "gid",                p_gid,    1,   3, ": ", NULL },
+       { "class",              p_class,  1,   5, ": ", NULL },
+       { "change",             p_change, 1,   6, NULL, NULL },
+       { "expire",             p_expire, 1,   6, NULL, NULL },
 #ifdef RESTRICT_FULLNAME_CHANGE                /* do not allow fullname changes */
-       { "full name",          p_gecos,  1,   9, e2,   },
+       { "full name",          p_gecos,  1,   9, ":,", NULL },
 #else
-       { "full name",          p_gecos,  0,   9, e2,   },
+       { "full name",          p_gecos,  0,   9, ":,", NULL },
 #endif
-       { "office phone",       p_gecos,  0,  12, e2,   },
-       { "home phone",         p_gecos,  0,  10, e2,   },
-       { "location",           p_gecos,  0,   8, e2,   },
-       { "other information",  p_gecos,  0,  11, e1,   },
-       { "home directory",     p_hdir,   1,  14, e1,   },
-       { "shell",              p_shell,  0,   5, e1,   },
-       { NULL, 0, },
+       { "office phone",       p_gecos,  0,  12, ":,", NULL },
+       { "home phone",         p_gecos,  0,  10, ":,", NULL },
+       { "office location",    p_gecos,  0,  15, ":,", NULL },
+       { "other information",  p_gecos,  0,  11, ": ", NULL },
+       { "home directory",     p_hdir,   1,  14, ": ", NULL },
+       { "shell",              p_shell,  0,   5, ": ", NULL },
+       { NULL, NULL, 0, 0, NULL, NULL },
 };