From 37cf831c25d3fbcc63a8548fc4ed7ead82562c5b Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 11 Jul 2015 23:07:17 +0000
Subject: Replace custom string array with stringlist(3)

---
 pw/pwupd.h | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'pw/pwupd.h')

diff --git a/pw/pwupd.h b/pw/pwupd.h
index 7a0cd2d..92e5548 100644
--- a/pw/pwupd.h
+++ b/pw/pwupd.h
@@ -36,6 +36,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <stdbool.h>
+#include <stringlist.h>
 
 #if defined(__FreeBSD__)
 #define	RET_SETGRENT	int
@@ -58,26 +59,25 @@ struct pwf {
 };
 
 struct userconf {
-	int	default_password;	/* Default password for new users? */
-	int	reuse_uids;		/* Reuse uids? */
-	int	reuse_gids;		/* Reuse gids? */
-	char	*nispasswd;		/* Path to NIS version of the passwd file */
-	char	*dotdir;		/* Where to obtain skeleton files */
-	char	*newmail;		/* Mail to send to new accounts */
-	char	*logfile;		/* Where to log changes */
-	char	*home;			/* Where to create home directory */
-	mode_t	homemode;		/* Home directory permissions */
-	char	*shelldir;		/* Where shells are located */
-	char	**shells;		/* List of shells */
-	char	*shell_default;		/* Default shell */
-	char	*default_group;		/* Default group number */
-	char	**groups;		/* Default (additional) groups */
-	char	*default_class;		/* Default user class */
-	uid_t	min_uid, max_uid;	/* Allowed range of uids */
-	gid_t	min_gid, max_gid;	/* Allowed range of gids */
-	int	expire_days;		/* Days to expiry */
-	int	password_days;		/* Days to password expiry */
-	int	numgroups;		/* (internal) size of default_group array */
+	int		default_password;	/* Default password for new users? */
+	int		reuse_uids;		/* Reuse uids? */
+	int		reuse_gids;		/* Reuse gids? */
+	char		*nispasswd;		/* Path to NIS version of the passwd file */
+	char		*dotdir;		/* Where to obtain skeleton files */
+	char		*newmail;		/* Mail to send to new accounts */
+	char		*logfile;		/* Where to log changes */
+	char		*home;			/* Where to create home directory */
+	mode_t		homemode;		/* Home directory permissions */
+	char		*shelldir;		/* Where shells are located */
+	char		**shells;		/* List of shells */
+	char		*shell_default;		/* Default shell */
+	char		*default_group;		/* Default group number */
+	StringList	*groups;		/* Default (additional) groups */
+	char		*default_class;		/* Default user class */
+	uid_t		min_uid, max_uid;	/* Allowed range of uids */
+	gid_t		min_gid, max_gid;	/* Allowed range of gids */
+	int		expire_days;		/* Days to expiry */
+	int		password_days;		/* Days to password expiry */
 };
 
 struct pwconf {
@@ -158,7 +158,6 @@ void           vendgrent(void);
 
 void copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid);
 void rm_r(char const * dir, uid_t uid);
-int extendarray(char ***buf, int *buflen, int needed);
 __END_DECLS
 
 #endif				/* !_PWUPD_H */
-- 
cgit v1.2.3