pw_checkname since the beginning if too strict on GECOS field,

[pw-darwin.git] / pw / grupd.c

diff --git a/pw/grupd.c b/pw/grupd.c
index edff76d1285c88dda81cd015850bffa215e1dafc..9cbe0cb0b345814ee2299abfcc50e94423352d92 100644 (file)
--- a/pw/grupd.c
+++ b/pw/grupd.c
@@ -29,143 +29,77 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <err.h>
+#include <grp.h>
+#include <libutil.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
 
 #include "pwupd.h"
 
-static char * grpath = _PATH_PWD;
-
-int
-setgrdir(const char * dir)
-{
-       if (dir == NULL)
-               return -1;
-       else {
-               char * d = malloc(strlen(dir)+1);
-               if (d == NULL)
-                       return -1;
-               grpath = strcpy(d, dir);
-       }
-       return 0;
-}
-
 char *
 getgrpath(const char * file)
 {
        static char pathbuf[MAXPATHLEN];
 
-       snprintf(pathbuf, sizeof pathbuf, "%s/%s", grpath, file);
-       return pathbuf;
-}
+       snprintf(pathbuf, sizeof pathbuf, "%s/%s", conf.etcpath, file);
 
-int
-grdb(char *arg,...)
-{
-       /*
-        * This is a stub for now, but maybe eventually be functional
-        * if ever an indexed version of /etc/groups is implemented.
-        */
-       arg=arg;
-       return 0;
+       return (pathbuf);
 }
 
-int
-fmtgrentry(char **buf, int * buflen, struct group * grp, int type)
+static int
+gr_update(struct group * grp, char const * group)
 {
-       int             i, l;
-
-       /*
-        * Since a group line is of arbitrary length,
-        * we need to calculate up-front just how long
-        * it will need to be...
-        */
-       /*  groupname              :   password                 :  gid  : */
-       l = strlen(grp->gr_name) + 1 + strlen(grp->gr_passwd) + 1 + 5 + 1;
-       /* group members + comma separator */
-       for (i = 0; grp->gr_mem[i] != NULL; i++) {
-               l += strlen(grp->gr_mem[i]) + 1;
-       }
-       l += 2; /* For newline & NUL */
-       if (extendline(buf, buflen, l) == -1)
-               l = -1;
-       else{
-               /*
-                * Now we can safely format
-                */
-               if (type == PWF_STANDARD)
-                       l = sprintf(*buf, "%s:*:%ld:", grp->gr_name, (long) grp->gr_gid);
-               else
-                       l = sprintf(*buf, "%s:%s:%ld:", grp->gr_name, grp->gr_passwd, (long) grp->gr_gid);
-
-               /*
-                * List members
-                */
-               for (i = 0; grp->gr_mem[i] != NULL; i++) {
-                       l += sprintf(*buf + l, "%s%s", i ? "," : "", grp->gr_mem[i]);
-               }
-
-               (*buf)[l++] = '\n';
-               (*buf)[l] = '\0';
-       }
-       return l;
-}
+       int pfd, tfd;
+       struct group *gr = NULL;
+       struct group *old_gr = NULL;
 
+       if (grp != NULL)
+               gr = gr_dup(grp);
 
-int
-fmtgrent(char **buf, int * buflen, struct group * grp)
-{
-       return fmtgrentry(buf, buflen, grp, PWF_STANDARD);
-}
+       if (group != NULL)
+               old_gr = GETGRNAM(group);
 
+       if (gr_init(conf.etcpath, NULL))
+               err(1, "gr_init()");
 
-static int
-gr_update(struct group * grp, char const * group, int mode)
-{
-       int             l;
-       char            pfx[64];
-       int             grbuflen = 0;
-       char           *grbuf = NULL;
-
-       ENDGRENT();
-       l = snprintf(pfx, sizeof pfx, "%s:", group);
-
-       /*
-        * Update the group file
-        */
-       if (grp != NULL && fmtgrentry(&grbuf, &grbuflen, grp, PWF_PASSWD) == -1)
-               l = -1;
-       else {
-               l = fileupdate(getgrpath(_GROUP), 0644, grbuf, pfx, l, mode);
-               if (l == 0)
-                       l = grdb(NULL);
+       if ((pfd = gr_lock()) == -1) {
+               gr_fini();
+               err(1, "gr_lock()");
+       }
+       if ((tfd = gr_tmp(-1)) == -1) {
+               gr_fini();
+               err(1, "gr_tmp()");
+       }
+       if (gr_copy(pfd, tfd, gr, old_gr) == -1) {
+               gr_fini();
+               err(1, "gr_copy()");
        }
-       if (grbuf != NULL)
-               free(grbuf);
-       return l;
+       if (gr_mkdb() == -1) {
+               gr_fini();
+               err(1, "gr_mkdb()");
+       }
+       free(gr);
+       gr_fini();
+       return 0;
 }
 
 
 int
 addgrent(struct group * grp)
 {
-       return gr_update(grp, grp->gr_name, UPD_CREATE);
+       return gr_update(grp, NULL);
 }
 
 int
 chggrent(char const * login, struct group * grp)
 {
-       return gr_update(grp, login, UPD_REPLACE);
+       return gr_update(grp, login);
 }
 
 int
 delgrent(struct group * grp)
 {
-       return gr_update(NULL, grp->gr_name, UPD_DELETE);
+
+       return (gr_update(NULL, grp->gr_name));
 }