X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-groupadd;h=d41bfc3872aa0a4cf0907c484d74cfb3f6e86cf8;hp=e2425670688b6fbbeba4db55996429828abc424b;hb=HEAD;hpb=ec1593c484fbadd6cff934c68ebf69e4916c59a4

diff --git a/ud-groupadd b/ud-groupadd
index e242567..d41bfc3 100755
--- a/ud-groupadd
+++ b/ud-groupadd
@@ -1,7 +1,26 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
 
-import string, re, time, ldap, getopt, sys, os, pwd;
+#   Copyright (c) 2000       Jason Gunthorpe <jgg@debian.org>
+#   Copyright (c) 2001-2003  James Troup <troup@debian.org>
+#   Copyright (c) 2004       Joey Schulze <joey@debian.org>
+#   Copyright (c) 2008       Peter Palfrader <peter@palfrader.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import re, time, ldap, getopt, sys, os, pwd;
 from userdir_ldap import *;
 from userdir_gpg import *;
 
@@ -9,15 +28,17 @@ from userdir_gpg import *;
 # this, one is to fetch all the entires and pick the highest, the other
 # is to randomly guess uids until one is free. This uses the former.
 # Regrettably ldap doesn't have an integer attribute comparision function
-# so we can only cut the search down slightly 
+# so we can only cut the search down slightly
+
+# [JT] This is broken with Woody LDAP and the Schema; for now just
+#      search through all GIDs.
 def GetFreeID(l):
-   HighestUID = 1000;
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,  
-                      "gidnumber>="+str(HighestUID),["gidnumber"]);
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,
+                      "gidNumber=*",["gidNumber"]);
    HighestUID = 0;
    for I in Attrs:
-      ID = int(GetAttr(I,"gidnumber","0"));
-      if ID > HighestUID and ID < 60000: 
+      ID = int(GetAttr(I,"gidNumber","0"));
+      if ID > HighestUID and ID < 60000:
          HighestUID = ID;
    return HighestUID + 1;
 
@@ -33,16 +54,10 @@ for (switch, val) in options:
    if (switch == '-u'):
       AdminUser = val;
 
-print "Accessing LDAP directory as '" + AdminUser + "'";
-Password = getpass(AdminUser + "'s password: ");
-
-# Connect to the ldap server
-l = ldap.open(LDAPServer);
-UserDn = "uid=" + AdminUser + "," + BaseDn;
-l.simple_bind_s(UserDn,Password);
+l = passwdAccessLDAP(BaseDn, AdminUser)
 
-while 1:    
-   Group = raw_input("Group name?");
+while 1:
+   Group = raw_input("Group name? ");
    if Group == "":
       sys.exit(1);
 
@@ -50,17 +65,14 @@ while 1:
    if len(Attrs) == 0:
       break;
    print "Group already exists";
-  
-Id = GetFreeID(l);  
+
+Id = GetFreeID(l);
 print "Create group %s ID = %d"%(Group,Id);
-       
-# Submit the add request   
+
+# Submit the add request
 Dn = "gid=" + Group + "," + BaseDn;
 print "Updating LDAP directory..",
 sys.stdout.flush();
 l.add_s(Dn,[("gid",Group),
-            ("gidnumber",str(Id)),
-            ("objectclass","top"),
-            ("objectclass","posixGroup")]);
-
-       
+            ("gidNumber",str(Id)),
+            ("objectClass", GroupObjectClasses)])