projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from zobel: Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
[mirror/userdir-ldap.git]
/
ud-arbimport
diff --git
a/ud-arbimport
b/ud-arbimport
index
ab3af80
..
7d306f7
100755
(executable)
--- a/
ud-arbimport
+++ b/
ud-arbimport
@@
-22,7
+22,7
@@
# the form of:
# uid: <data>
# the form of:
# uid: <data>
-import
string,
re, time, ldap, getopt, sys;
+import re, time, ldap, getopt, sys;
from userdir_ldap import *;
# Process options
from userdir_ldap import *;
# Process options
@@
-36,7
+36,7
@@
for (switch, val) in options:
NoAct = 1;
if len(arguments) == 0:
print "Give the key to assignt to then the file to import";
NoAct = 1;
if len(arguments) == 0:
print "Give the key to assignt to then the file to import";
- os.exit(0);
+ sys.exit(0)
# Main program starts here
l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
# Main program starts here
l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
@@
-52,7
+52,7
@@
while(1):
if User == None:
User = Split[0];
if Split[0] == User:
if User == None:
User = Split[0];
if Split[0] == User:
- Set.append(
string.strip(Split[1]
));
+ Set.append(
Split[1].strip(
));
continue;
else:
if len(Set) == 0:
continue;
else:
if len(Set) == 0:
@@
-74,4
+74,4
@@
while(1):
if Line == "":
break;
User = Split[0];
if Line == "":
break;
User = Split[0];
- Set = [
string.strip(Split[1]
)];
+ Set = [
Split[1].strip(
)];