diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-18 11:50:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-19 08:02:32 +0200 |
| commit | 1cbbd2d9803bfaf7545b7de478b50083c5a82c3d (patch) | |
| tree | 17bd46c604ad666fb08ba7285bd1b9979e7eca4d | |
| parent | 376dc5cc5da44f154637187bfccf52821e837e37 (diff) | |
| download | samba-1cbbd2d9803bfaf7545b7de478b50083c5a82c3d.tar.gz samba-1cbbd2d9803bfaf7545b7de478b50083c5a82c3d.tar.bz2 samba-1cbbd2d9803bfaf7545b7de478b50083c5a82c3d.zip | |
lib/param: bring lp_time_server() into common
| -rw-r--r-- | lib/param/loadparm.c | 1 | ||||
| -rw-r--r-- | lib/param/param_functions.c | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 1341581139..9b8bedc2e2 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1534,7 +1534,6 @@ static struct loadparm_context *global_loadparm_context; /* These functions remain only in lib/param for now */ FN_GLOBAL_BOOL(idmap_trusted_only, bIdmapTrustedOnly) FN_GLOBAL_BOOL(readraw, bReadRaw) -FN_GLOBAL_BOOL(time_server, bTimeServer) FN_GLOBAL_BOOL(unicode, bUnicode) FN_GLOBAL_BOOL(writeraw, bWriteRaw) FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index a13ae02434..914150a337 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -214,6 +214,7 @@ FN_GLOBAL_BOOL(rpc_big_endian, bRpcBigEndian) FN_GLOBAL_BOOL(stat_cache, bStatCache) FN_GLOBAL_BOOL(syslog_only, bSyslogOnly) FN_GLOBAL_BOOL(timestamp_logs, bTimestampLogs) +FN_GLOBAL_BOOL(time_server, bTimeServer) FN_GLOBAL_BOOL(tls_enabled, tls_enabled) FN_GLOBAL_BOOL(unix_extensions, bUnixExtensions) FN_GLOBAL_BOOL(unix_password_sync, bUnixPasswdSync) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index d834fd7bd0..5486b0a92f 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5042,7 +5042,6 @@ char *lp_ ## fn_name(TALLOC_CTX *ctx,int i) {return(lp_string((ctx), (LP_SNUM_OK static FN_GLOBAL_BOOL(domain_logons, bDomainLogons) static FN_GLOBAL_BOOL(_readraw, bReadRaw) -static FN_GLOBAL_BOOL(time_server, bTimeServer) static FN_GLOBAL_BOOL(_writeraw, bWriteRaw) static FN_GLOBAL_CONST_STRING(_ctdbd_socket, ctdbdSocket) static FN_GLOBAL_INTEGER(_server_role, ServerRole) |