SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
-GenderTable = {"male": 1,
- "1": 1,
- "female": 2,
- "2": 2,
- "unspecified": 9,
- "9": 9,
+GenderTable = {"male": '1',
+ "1": '1',
+ "female": '2',
+ "2": '2',
+ "unspecified": '9',
+ "9": '9',
};
ArbChanges = {"c": "..",
global SudoPasswd
result = "\n"
+ if len(SudoPasswd) == 0:
+ return None
+
res = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+uid, ['sudoPassword']);
if len(res) != 1:
raise UDFormatError, "Not exactly one hit when searching for user"
if CommitChanges == 1: # only if we are still good to go
try:
Res = FinishConfirmSudopassword(l, GetAttr(DnRecord,"uid"), Attrs)
- Result = Result + Res + "\n";
+ if not Res is None:
+ Result = Result + Res + "\n";
except Error, e:
CommitChanges = 0
Result = Result + "FinishConfirmSudopassword raised an error (%s) - no changes committed\n"%(e);