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 753360d8d90f0eb5322434cf27bd9c65f3c6e331..9cbe0cb0b345814ee2299abfcc50e94423352d92 100644 (file)
--- a/pw/grupd.c
+++ b/pw/grupd.c
@@ -1,26 +1,20 @@
 /*-
 /*-

- * Copyright (c) 1996 by David L. Nugent <davidn@blaze.net.au>.
- * All rights reserved.
+ * Copyright (C) 1996
+ *     David L. Nugent.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified.
+ *    notice, this list of conditions and the following disclaimer.

  * 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.
  * 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 David L. Nugent.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE DAVID L. NUGENT ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY DAVID L. NUGENT AND CONTRIBUTORS ``AS IS'' AND

  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT OR CONTRIBUTORS BE LIABLE

  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)


@@ -28,84 +22,84 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.

- *
- *     $Id$

  */
 
  */
 

+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
+#include <err.h>
+#include <grp.h>
+#include <libutil.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>

 
 #include "pwupd.h"
 
 
 #include "pwupd.h"
 

-int
-fmtgrentry(char *buf, struct group * grp, int type)
+char *
+getgrpath(const char * file)

 {
 {

-       int             i, l;
-
-       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);
-
-       /*
-        * Now, list members
-        */
-       for (i = 0; i < 200 && grp->gr_mem[i]; i++)
-               l += sprintf(buf + l, "%s%s", i ? "," : "", grp->gr_mem[i]);
-       buf[l++] = '\n';
-       buf[l] = '\0';
-       return l;
-}
+       static char pathbuf[MAXPATHLEN];

 
 

+       snprintf(pathbuf, sizeof pathbuf, "%s/%s", conf.etcpath, file);

 
 

-int
-fmtgrent(char *buf, struct group * grp)
-{
-       return fmtgrentry(buf, grp, PWF_STANDARD);
+       return (pathbuf);

 }
 
 }
 

-

 static int
 static int

-gr_update(struct group * grp, char const * group, int mode)
+gr_update(struct group * grp, char const * group)

 {
 {

-       int             l;
-       char            pfx[32];
-       char            grbuf[MAXPWLINE];
-
-       endgrent();
-       l = sprintf(pfx, "%s:", group);
-
-       /*
-        * Update the group file
-        */
-       if (grp == NULL)
-               *grbuf = '\0';
-       else
-               fmtgrentry(grbuf, grp, PWF_PASSWD);
-       return fileupdate(_PATH_GROUP, 0644, grbuf, pfx, l, mode);
+       int pfd, tfd;
+       struct group *gr = NULL;
+       struct group *old_gr = NULL;
+
+       if (grp != NULL)
+               gr = gr_dup(grp);
+
+       if (group != NULL)
+               old_gr = GETGRNAM(group);
+
+       if (gr_init(conf.etcpath, NULL))
+               err(1, "gr_init()");
+
+       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 (gr_mkdb() == -1) {
+               gr_fini();
+               err(1, "gr_mkdb()");
+       }
+       free(gr);
+       gr_fini();
+       return 0;

 }
 
 
 int
 addgrent(struct group * grp)
 {
 }
 
 
 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)
 {
 }
 
 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)
 {
 }
 
 int
 delgrent(struct group * grp)
 {

-       return gr_update(NULL, grp->gr_name, UPD_DELETE);
+
+       return (gr_update(NULL, grp->gr_name));

 }
 }