diff --git a/authconfig-5.3.13-locauthorize-default.patch b/authconfig-5.3.13-locauthorize-default.patch new file mode 100644 index 0000000..89c7993 --- /dev/null +++ b/authconfig-5.3.13-locauthorize-default.patch @@ -0,0 +1,22 @@ +--- authconfig-5.3.13/authconfig.py.locauthorize 2006-10-20 20:09:34.000000000 +0200 ++++ authconfig-5.3.13/authconfig.py 2007-05-04 15:25:06.000000000 +0200 +@@ -253,6 +253,8 @@ + self.info = authinfo.read(self.printError) + # FIXME: what about printing critical errors reading individual configs? + self.pristineinfo = self.info.copy() ++ if self.info.enableLocAuthorize == None: ++ self.info.enableLocAuthorize = True # ON by default + + def testAvailableSubsys(self): + self.nis_avail = (os.access(authinfo.PATH_YPBIND, os.X_OK) and +--- authconfig-5.3.13/authconfig-gtk.py.locauthorize 2006-08-24 21:22:17.000000000 +0200 ++++ authconfig-5.3.13/authconfig-gtk.py 2007-05-04 15:27:45.000000000 +0200 +@@ -177,6 +177,8 @@ + } + self.info = authinfo.read(self.message_callback) + self.pristineinfo = self.info.copy() ++ if self.info.enableLocAuthorize == None: ++ self.info.enableLocAuthorize = True # ON by default + return + + def destroy_widget(self, button, widget): diff --git a/authconfig-5.3.13-nisdomain.patch b/authconfig-5.3.13-nisdomain.patch new file mode 100644 index 0000000..e355bcf --- /dev/null +++ b/authconfig-5.3.13-nisdomain.patch @@ -0,0 +1,34 @@ +--- authconfig-5.3.13/authinfo.py.nisdomain 2007-03-19 20:32:42.000000000 +0100 ++++ authconfig-5.3.13/authinfo.py 2007-04-11 09:40:48.000000000 +0200 +@@ -834,9 +834,8 @@ + value = value.split(None, 1) + if len(value) < 1: + continue +- if self.nisLocalDomain and value[0] != self.nisLocalDomain: ++ if value[0] != self.nisLocalDomain: + continue +- self.nisDomain = value[0] + if len(value) < 2: + continue + value = value[1] +@@ -847,10 +846,6 @@ + self.nisServer = commaAppend(self.nisServer, value) + + f.close() +- if self.nisLocalDomain and not self.nisDomain: +- self.nisDomain = self.nisLocalDomain +- if self.nisDomain and not self.nisLocalDomain: +- self.nisLocalDomain = self.nisDomain + return True + + def ldapHostsToURIs(self, s): +@@ -1380,6 +1375,9 @@ + + shv.close() + ++ if self.nisLocalDomain: ++ self.nisDomain = self.nisLocalDomain ++ + return True + + # Compare two authInfoType structures and return True if they have any diff --git a/authconfig.spec b/authconfig.spec index 5499d20..abfdbc4 100644 --- a/authconfig.spec +++ b/authconfig.spec @@ -3,7 +3,7 @@ Name: authconfig Version: 5.3.13 # Don't change release in elvis CVS, up version after merging all patches # from dist CVS instead. -Release: 3%{?dist} +Release: 4%{?dist} License: GPL ExclusiveOS: Linux Group: System Environment/Base @@ -20,6 +20,8 @@ BuildRequires: glib2-devel, python, python-devel BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser Patch1: authconfig-5.3.13-nssldap-path.patch +Patch2: authconfig-5.3.13-nisdomain.patch +Patch3: authconfig-5.3.13-locauthorize-default.patch %description Authconfig is a command line utility which can configure a workstation @@ -42,6 +44,8 @@ authentication schemes. %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .nssldap-path +%patch1 -p1 -b .nisdomain +%patch1 -p1 -b .locauthorize %build CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS @@ -102,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/* %changelog +* Fri May 4 2007 Tomas Mraz - 5.3.13-4 +- local nis domain is obtained from sysconfig/network (#235927) +- set "local authorization is sufficient" on by default + * Thu Apr 5 2007 Tomas Mraz - 5.3.13-3 - minor changes and cleanups for merge review (#225293)