GenerateDir = ConfModule.generatedir;
AllowedGroupsPreload = ConfModule.allowedgroupspreload;
HomePrefix = ConfModule.homeprefix;
-DefaultGID = ConfModule.defaultgid;
TemplatesDir = ConfModule.templatesdir;
PassDir = ConfModule.passdir;
Ech_ErrorLog = ConfModule.ech_errorlog;
except AttributeError:
UseSSL = False;
+try:
+ BaseBaseDn = ConfModule.basebasedn;
+except AttributeError:
+ BaseBaseDn = BaseDn
+
+try:
+ IgnoreUsersForUIDNumberGen = ConfModule.ignoreusersforuidnumbergen
+except AttributeError:
+ IgnoreUsersForUIDNumberGen = ['nobody']
+
+
# Break up the keyring list
userdir_gpg.SetKeyrings(ConfModule.keyrings.split(":"))
# SSH Key splitting. The result is:
# (options,size,modulous,exponent,comment)
SSHAuthSplit = re.compile('^(.* )?(\d+) (\d+) (\d+) ?(.+)$');
-SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa) ([a-zA-Z0-9=/+]+) ?(.+)$');
+SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa|ecdsa-sha2-nistp(?:256|384|521)|ed25519) ([a-zA-Z0-9=/+]+) ?(.+)$');
#'^([^\d](?:[^ "]+(?:".*")?)*)? ?(\d+) (\d+) (\d+) (.+)$');
AddressSplit = re.compile("(.*).*<([^@]*)@([^>]*)>");