|
 |
ee2f06 |
diff -up authconfig-6.2.8/authconfig.py.template-group authconfig-6.2.8/authconfig.py
|
|
|
ee2f06 |
--- authconfig-6.2.8/authconfig.py.template-group 2016-06-16 11:52:48.081598147 +0200
|
|
|
ee2f06 |
+++ authconfig-6.2.8/authconfig.py 2016-06-16 14:25:21.353653203 +0200
|
|
|
ee2f06 |
@@ -233,8 +233,6 @@ class Authconfig:
|
|
|
ee2f06 |
help=_("the character which will be used to separate the domain and user part of winbind-created user names if winbindusedefaultdomain is not enabled"))
|
|
|
ee2f06 |
parser.add_option("--winbindtemplatehomedir", metavar="</home/%D/%U>",
|
|
|
ee2f06 |
help=_("the directory which winbind-created users will have as home directories"))
|
|
|
ee2f06 |
- parser.add_option("--winbindtemplateprimarygroup", metavar="<nobody>",
|
|
|
ee2f06 |
- help=_("the group which winbind-created users will have as their primary group"))
|
|
|
ee2f06 |
parser.add_option("--winbindtemplateshell", metavar="</bin/false>",
|
|
|
ee2f06 |
help=_("the shell which winbind-created users will have as their login shell"))
|
|
|
ee2f06 |
parser.add_option("--enablewinbindusedefaultdomain", action="store_true",
|
|
|
ee2f06 |
@@ -490,7 +488,6 @@ class Authconfig:
|
|
|
ee2f06 |
"smbidmaprange":"smbIdmapRange",
|
|
|
ee2f06 |
"winbindseparator":"winbindSeparator",
|
|
|
ee2f06 |
"winbindtemplatehomedir":"winbindTemplateHomedir",
|
|
|
ee2f06 |
- "winbindtemplateprimarygroup":"winbindTemplatePrimaryGroup",
|
|
|
ee2f06 |
"winbindtemplateshell":"winbindTemplateShell",
|
|
|
ee2f06 |
"ipav2domain":"ipav2Domain",
|
|
|
ee2f06 |
"ipav2realm":"ipav2Realm",
|
|
|
ee2f06 |
diff -up authconfig-6.2.8/authinfo.py.template-group authconfig-6.2.8/authinfo.py
|
|
|
ee2f06 |
--- authconfig-6.2.8/authinfo.py.template-group 2016-06-16 13:53:03.002686209 +0200
|
|
|
ee2f06 |
+++ authconfig-6.2.8/authinfo.py 2016-06-16 14:25:21.354653226 +0200
|
|
|
ee2f06 |
@@ -1303,7 +1303,6 @@ class AuthInfo:
|
|
|
ee2f06 |
|
|
|
ee2f06 |
self.winbindSeparator = ""
|
|
|
ee2f06 |
self.winbindTemplateHomedir = ""
|
|
|
ee2f06 |
- self.winbindTemplatePrimaryGroup = ""
|
|
|
ee2f06 |
self.winbindTemplateShell = ""
|
|
|
ee2f06 |
self.winbindUseDefaultDomain = None
|
|
|
ee2f06 |
self.winbindOffline = None
|
|
|
ee2f06 |
@@ -1437,8 +1436,7 @@ class AuthInfo:
|
|
|
ee2f06 |
("enableFprintd", "b"), ("enableSmartcard", "b"), ("forceSmartcard", "b")]),
|
|
|
ee2f06 |
SaveGroup(self.writeWinbind, self.toggleWinbindService, [("smbWorkgroup", "i"), ("smbServers", "i"),
|
|
|
ee2f06 |
("smbRealm", "c"), ("smbSecurity", "i"), ("smbIdmapRange", "i"),
|
|
|
ee2f06 |
- ("winbindSeparator", "c"), ("winbindTemplateHomedir", "c"),
|
|
|
ee2f06 |
- ("winbindTemplatePrimaryGroup", "c"), ("winbindTemplateShell", "c"),
|
|
|
ee2f06 |
+ ("winbindSeparator", "c"), ("winbindTemplateHomedir", "c"), ("winbindTemplateShell", "c"),
|
|
|
ee2f06 |
("winbindUseDefaultDomain", "b"), ("winbindOffline", "b"), ("winbindKrb5", "b")]),
|
|
|
ee2f06 |
SaveGroup(self.writeNSS, None, [("enableDB", "b"), ("enableDirectories", "b"), ("enableWinbind", "b"),
|
|
|
ee2f06 |
("enableOdbcbind", "b"), ("enableNIS3", "b"), ("enableNIS", "b"),
|
|
|
ee2f06 |
@@ -2003,9 +2001,6 @@ class AuthInfo:
|
|
|
ee2f06 |
tmp = self.readWinbindGlobal("template homedir")
|
|
|
ee2f06 |
if tmp:
|
|
|
ee2f06 |
self.setParam("winbindTemplateHomedir", tmp, ref)
|
|
|
ee2f06 |
- tmp = self.readWinbindGlobal("template primary group")
|
|
|
ee2f06 |
- if tmp:
|
|
|
ee2f06 |
- self.setParam("winbindTemplatePrimaryGroup", tmp, ref)
|
|
|
ee2f06 |
tmp = self.readWinbindGlobal("template shell")
|
|
|
ee2f06 |
if tmp:
|
|
|
ee2f06 |
self.setParam("winbindTemplateShell", tmp, ref)
|
|
|
ee2f06 |
@@ -3472,10 +3467,6 @@ class AuthInfo:
|
|
|
ee2f06 |
output += " template homedir = "
|
|
|
ee2f06 |
output += self.winbindTemplateHomedir
|
|
|
ee2f06 |
output += "\n"
|
|
|
ee2f06 |
- if self.winbindTemplatePrimaryGroup:
|
|
|
ee2f06 |
- output += " template primary group = "
|
|
|
ee2f06 |
- output += self.winbindTemplatePrimaryGroup
|
|
|
ee2f06 |
- output += "\n"
|
|
|
ee2f06 |
if self.winbindTemplateShell:
|
|
|
ee2f06 |
output += " template shell = "
|
|
|
ee2f06 |
output += self.winbindTemplateShell
|
|
|
ee2f06 |
@@ -3518,8 +3509,7 @@ class AuthInfo:
|
|
|
ee2f06 |
all_configs[CFG_SMB].backup(self.backupDir)
|
|
|
ee2f06 |
options = ["workgroup", "password server", "realm", "security",
|
|
|
ee2f06 |
"domain logons", "domain master",
|
|
|
ee2f06 |
- "idmap uid", "idmap gid", "winbind separator",
|
|
|
ee2f06 |
- "template homedir", "template primary group",
|
|
|
ee2f06 |
+ "idmap uid", "idmap gid", "winbind separator", "template homedir",
|
|
|
ee2f06 |
"template shell", "winbind use default domain",
|
|
|
ee2f06 |
"winbind offline logon", "kerberos method"]
|
|
|
ee2f06 |
f = None
|