Author: jim
Date: 2006-08-10 21:09:34 -0600 (Thu, 10 Aug 2006)
New Revision: 1628
Modified:
trunk/
trunk/shadow/shadow-4.0.18.1-useradd_fix-1.patch
Log:
[EMAIL PROTECTED]: jim | 2006-08-10 20:09:19 -0700
Fixed shadow patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1872
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1874
Modified: trunk/shadow/shadow-4.0.18.1-useradd_fix-1.patch
===================================================================
--- trunk/shadow/shadow-4.0.18.1-useradd_fix-1.patch 2006-08-10 20:41:07 UTC
(rev 1627)
+++ trunk/shadow/shadow-4.0.18.1-useradd_fix-1.patch 2006-08-11 03:09:34 UTC
(rev 1628)
@@ -1,78 +1,51 @@
Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2006-01-03
-Initial Package Version: 4.0.14
+Date: 2006-08-10
+Initial Package Version: 4.0.18.1
Origin: Jim Gifford
Upstream Status: Submitted
-Description: Fixed default values
- As released libpam libselinux and audit are
- turned on by default. This patch corrects
- the issue.
+Description: Fixes usersadd issue
-diff -Naur shadow-4.0.14.orig/configure shadow-4.0.14/configure
---- shadow-4.0.14.orig/configure 2006-01-03 16:12:36.000000000 +0000
-+++ shadow-4.0.14/configure 2006-01-03 23:22:25.000000000 +0000
-@@ -1048,10 +1048,9 @@
- both]
- --with-tags[=TAGS]
- include additional configurations [automatic]
-- --with-audit use auditing support [default=yes if found]
-- --with-libpam use libpam for PAM support [default=yes if
-- found]
-- --with-selinux use SELinux support [default=autodetect]
-+ --with-audit use auditing support [default=no]
-+ --with-libpam use libpam for PAM support [default=no]
-+ --with-selinux use SELinux support [default=no]
- --with-skey use S/Key support [default=no]
- --with-libcrack use libcrack [default=yes if found and if PAM not
- enabled]
-@@ -22185,7 +22184,7 @@
- withval="$with_audit"
- with_audit=$withval
- else
-- with_audit=yes
-+ with_audit=no
- fi;
+--- shadow-4.0.18.1.orig/src/useradd.c 2006-07-28 19:42:48.000000000 +0200
++++ shadow-4.0.18.1/src/useradd.c 2006-08-04 09:24:34.000000000 +0200
+@@ -203,13 +203,17 @@
+ long gid;
+ char *errptr;
- # Check whether --with-libpam or --without-libpam was given.
-@@ -22193,7 +22192,7 @@
- withval="$with_libpam"
- with_libpam=$withval
- else
-- with_libpam=yes
-+ with_libpam=no
- fi;
++ struct group* grp = getgrnam (grname);
++ if (grp)
++ return grp;
++
+ gid = strtol (grname, &errptr, 10);
+ if (*errptr || errno == ERANGE || gid < 0) {
+ fprintf (stderr,
+ _("%s: invalid numeric argument '%s'\n"), Prog,
grname);
+ exit (E_BAD_ARG);
+ }
+- return getgrnam (grname);
++ return getgrgid (gid);
+ }
- # Check whether --with-selinux or --without-selinux was given.
-@@ -22201,7 +22200,7 @@
- withval="$with_selinux"
- with_selinux=$withval
- else
-- with_selinux=yes
-+ with_selinux=no
- fi;
+ static long get_number (const char *numstr)
+--- shadow-4.0.18.1.orig/src/usermod.c 2006-07-28 19:42:48.000000000 +0200
++++ shadow-4.0.18.1/src/usermod.c 2006-08-04 09:24:21.000000000 +0200
+@@ -165,13 +165,17 @@
+ long val;
+ char *errptr;
- # Check whether --with-skey or --without-skey was given.
-diff -Naur shadow-4.0.14.orig/configure.in shadow-4.0.14/configure.in
---- shadow-4.0.14.orig/configure.in 2006-01-02 23:51:44.000000000 +0000
-+++ shadow-4.0.14/configure.in 2006-01-03 23:23:48.000000000 +0000
-@@ -219,14 +219,14 @@
- )
++ struct group* grp = getgrnam (grname);
++ if (grp)
++ return grp;
++
+ val = strtol (grname, &errptr, 10);
+ if (*errptr || errno == ERANGE || val < 0) {
+ fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+ grname);
+ exit (E_BAD_ARG);
+ }
+- return getgrnam (grname);
++ return getgrgid (val);
+ }
- AC_ARG_WITH(audit,
-- [AC_HELP_STRING([--with-audit], [use auditing support @<:@default=yes
if found@:>@])],
-- [with_audit=$withval], [with_audit=yes])
-+ [AC_HELP_STRING([--with-audit], [use auditing support
@<:@default=no@:>@])],
-+ [with_audit=$withval], [with_audit=no])
- AC_ARG_WITH(libpam,
-- [AC_HELP_STRING([--with-libpam], [use libpam for PAM support
@<:@default=yes if found@:>@])],
-- [with_libpam=$withval], [with_libpam=yes])
-+ [AC_HELP_STRING([--with-libpam], [use libpam for PAM support
@<:@default=no@:>@])],
-+ [with_libpam=$withval], [with_libpam=no])
- AC_ARG_WITH(selinux,
-- [AC_HELP_STRING([--with-selinux], [use SELinux support
@<:@default=autodetect@:>@])],
-- [with_selinux=$withval], [with_selinux=yes])
-+ [AC_HELP_STRING([--with-selinux], [use SELinux support
@<:@default=not@:>@])],
-+ [with_selinux=$withval], [with_selinux=no])
- AC_ARG_WITH(skey,
- [AC_HELP_STRING([--with-skey], [use S/Key support @<:@default=no@:>@])],
- [with_skey=$withval], [with_skey=no])
+ /*
+
+
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
