diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-13 17:55:41 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-13 19:51:41 +0200 |
| commit | 46168e99f7c6116b96335635ad974c7d8e20948e (patch) | |
| tree | 3f97be969a9a1389ffbac7e60131e84bd0da64ac /source3 | |
| parent | c31f95f66dcf1c11646b1edd84966e8369904a8c (diff) | |
| download | samba-46168e99f7c6116b96335635ad974c7d8e20948e.tar.gz samba-46168e99f7c6116b96335635ad974c7d8e20948e.tar.bz2 samba-46168e99f7c6116b96335635ad974c7d8e20948e.zip | |
s3-param Deprecate a number of security parameters for 3.6
This follows up on the agreement on the samba-technical list in Jan
2011 to deprecate these options, and to possibly remove these in the
4.0 release after user feedback.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri May 13 19:51:41 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 2f67c502d2..e4dd3661da 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1160,7 +1160,7 @@ static struct parm_struct parm_table[] = { .ptr = &Globals.bNullPasswords, .special = NULL, .enum_list = NULL, - .flags = FLAG_ADVANCED, + .flags = FLAG_ADVANCED | FLAG_DEPRECATED, }, { .label = "obey pam restrictions", @@ -1259,7 +1259,7 @@ static struct parm_struct parm_table[] = { .ptr = &Globals.bEnablePrivileges, .special = NULL, .enum_list = NULL, - .flags = FLAG_ADVANCED, + .flags = FLAG_ADVANCED | FLAG_DEPRECATED, }, { @@ -1332,7 +1332,7 @@ static struct parm_struct parm_table[] = { .ptr = &Globals.pwordlevel, .special = NULL, .enum_list = NULL, - .flags = FLAG_ADVANCED, + .flags = FLAG_ADVANCED | FLAG_DEPRECATED, }, { .label = "username level", @@ -1431,7 +1431,7 @@ static struct parm_struct parm_table[] = { .ptr = &sDefault.szUsername, .special = NULL, .enum_list = NULL, - .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE, + .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE | FLAG_DEPRECATED, }, { .label = "user", @@ -2294,7 +2294,7 @@ static struct parm_struct parm_table[] = { .ptr = &Globals.bUseSpnego, .special = NULL, .enum_list = NULL, - .flags = FLAG_ADVANCED, + .flags = FLAG_ADVANCED | FLAG_DEPRECATED, }, { .label = "client signing", @@ -9579,6 +9579,12 @@ static bool lp_load_ex(const char *pszFname, set_default_server_announce_type(); set_allowed_client_auth(); + if (lp_security() == SEC_SHARE) { + DEBUG(1, ("WARNING: The security=share option is deprecated\n")); + } else if (lp_security() == SEC_SERVER) { + DEBUG(1, ("WARNING: The security=server option is deprecated\n")); + } + bLoaded = True; /* Now we check bWINSsupport and set szWINSserver to 127.0.0.1 */ |