[debian-edu-commits] r81952 - in branches/wheezy/debian-edu-config: debian etc/samba

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-07 07:13:26 +0000 (Wed, 07 Aug 2013)
New Revision: 81952

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/debian/control
   branches/wheezy/debian-edu-config/etc/samba/smbldap-machineadd-gosa
Log:
Change smbldap-machineadd-gosa to call user_next_uid() instead of
get_next_id(), to work with the version of smbldap-tools in
Wheezy.  Not sure when get_next_id() disappeared, but it is
missing in version 0.9.7-1 and was present in version 0.9.5.
Depend on smbldap-tools (>= 0.9.7-1) to document the updated
requirement.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-07 04:47:43 UTC (rev 81951)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-07 07:13:26 UTC (rev 81952)
@@ -1,3 +1,14 @@
+debian-edu-config (1.712~svn81949) UNRELEASED; urgency=low
+
+  * Change smbldap-machineadd-gosa to call user_next_uid() instead of
+    get_next_id(), to work with the version of smbldap-tools in
+    Wheezy.  Not sure when get_next_id() disappeared, but it is
+    missing in version 0.9.7-1 and was present in version 0.9.5.
+    Depend on smbldap-tools (>= 0.9.7-1) to document the updated
+    requirement.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 07 Aug 2013 08:26:00 +0200
+
 debian-edu-config (1.712~svn81948) wheezy-test; urgency=low
 
   [ Mike Gabriel ]

Modified: branches/wheezy/debian-edu-config/debian/control
===================================================================
--- branches/wheezy/debian-edu-config/debian/control	2013-08-07 04:47:43 UTC (rev 81951)
+++ branches/wheezy/debian-edu-config/debian/control	2013-08-07 07:13:26 UTC (rev 81952)
@@ -17,7 +17,7 @@
 
 Package: debian-edu-config
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, debconf-utils, cfengine2, libconfig-inifiles-perl, mime-support, libnet-ldap-perl, ng-utils, host, desktop-profiles, lsb-base, lsb-release, ssl-cert, openssl, libfilesys-df-perl, libtext-unaccent-perl, libhtml-fromtext-perl, libio-socket-ssl-perl, discover, tftp | tftp-hpa, debian-edu-artwork, education-tasks (>= 0.853), net-tools, patch, base-files (>= 5.3), python-notify, libterm-readkey-perl, fping, ldap-utils, libnet-netmask-perl, smbldap-tools, lockfile-progs, libproxy-tools, libwebkitgtk-1.0-0
+Depends: ${misc:Depends}, ${python:Depends}, debconf-utils, cfengine2, libconfig-inifiles-perl, mime-support, libnet-ldap-perl, ng-utils, host, desktop-profiles, lsb-base, lsb-release, ssl-cert, openssl, libfilesys-df-perl, libtext-unaccent-perl, libhtml-fromtext-perl, libio-socket-ssl-perl, discover, tftp | tftp-hpa, debian-edu-artwork, education-tasks (>= 0.853), net-tools, patch, base-files (>= 5.3), python-notify, libterm-readkey-perl, fping, ldap-utils, libnet-netmask-perl, smbldap-tools (>= 0.9.7-1), lockfile-progs, libproxy-tools, libwebkitgtk-1.0-0
 Recommends: resolvconf, ddccontrol | xresprobe, syslinux, memtest86+, libnotify-bin, lsof, binutils
 Suggests: atftpd | tftpd-hpa
 Breaks: nslcd (<< 0.7.7), dhcp3-client (<< 4.1.1-P1-9), dhcp3-server (<< 4.1.1-P1-9), slapd (<< 2.4.23-5), debian-edu-install (<< 1.521~svn74617)

Modified: branches/wheezy/debian-edu-config/etc/samba/smbldap-machineadd-gosa
===================================================================
--- branches/wheezy/debian-edu-config/etc/samba/smbldap-machineadd-gosa	2013-08-07 04:47:43 UTC (rev 81951)
+++ branches/wheezy/debian-edu-config/etc/samba/smbldap-machineadd-gosa	2013-08-07 07:13:26 UTC (rev 81952)
@@ -215,7 +215,7 @@
 
 my $userUidNumber = $Options{'u'};
 if ( !defined($userUidNumber) ) {
-    $userUidNumber = get_next_id( $config{usersdn}, "uidNumber" );
+    $userUidNumber = user_next_uid();
 }
 elsif ( getpwuid($userUidNumber) ) {
     die "Uid already exists.\n";