Revert the libcrypt/libmd stuff back to how it was. This should not have

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

diff --git a/pw/pw_conf.c b/pw/pw_conf.c
index 144737f68ac9dafcad23b908f9140314ce2dec00..e8a21051d1a590c379216c48b4e1567157c34e44 100644 (file)
--- a/pw/pw_conf.c
+++ b/pw/pw_conf.c
@@ -22,16 +22,18 @@
  * 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: pw_conf.c,v 1.5 1997/02/22 16:12:27 peter Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 
 #include "pw.h"
-#include "pwupd.h"
 
 #define debugging 0
 
@@ -96,7 +98,8 @@ static struct userconf config =
        1000, 32000,            /* Allowed range of uids */
        1000, 32000,            /* Allowed range of gids */
        0,                      /* Days until account expires */
-       0                       /* Days until password expires */
+       0,                      /* Days until password expires */
+       0                       /* size of default_group array */
 };
 
 static char const *comments[_UC_FIELDS] =
@@ -307,7 +310,7 @@ read_userconfig(char const * file)
                                        break;
                                case _UC_DEFAULTGROUP:
                                        q = unquote(q);
-                                       config.default_group = (q == NULL || !boolean_val(q, 1) || getgrnam(q) == NULL)
+                                       config.default_group = (q == NULL || !boolean_val(q, 1) || GETGRNAM(q) == NULL)
                                                ? NULL : newstr(q);
                                        break;
                                case _UC_EXTRAGROUPS: