[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sat Sep 11 06:32:29 MDT 2010
The branch, master has been updated
via e84ab1b s4-privs Fix enum privileges in LSARPC server
via 07cf3ba s3-auth Fix typo in comment
via 6d61586 nss-waf: use the right winbind pipe path
via a82fe6f winbind-waf: the installed name is libnss_winbind.so.2
via e13ed6f s4:gensec Put the "NTLM" string for NTLMSSP's SASL name in a header
via 2921a88 s4-param: removed the lp_ varients of the functions
via 2a93814 s4-param: move back to auto-generation of loadparm prototypes
via 837230f s4-credentials: get all attributes in cli_credentials_set_secrets()
via bc6a3a2 security.idl Clarify that this is not a network structure
from b9b93b8 libcli/auth/schannel_state_tdb.c - fix includes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e84ab1b35fc6d1b1fbb4c02102be96db3e08cb83
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 11 20:38:15 2010 +1000
s4-privs Fix enum privileges in LSARPC server
We were returning the index, not the LUID value
Andrew Bartlett
commit 07cf3ba5c46bf43de7b1ce3278203e357bed19dd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 11 20:38:02 2010 +1000
s3-auth Fix typo in comment
commit 6d6158617ce55426e7753d37cb96bd4705ee1054
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Jul 19 15:43:25 2010 +1000
nss-waf: use the right winbind pipe path
s4 uses a different location for the winbind pipe to s3
commit a82fe6f4729b138e81a00cdd4204361f35864ef6
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Jul 19 15:42:42 2010 +1000
winbind-waf: the installed name is libnss_winbind.so.2
the .2 is what libc adds to the name for this version of the nss API
commit e13ed6fc789d27daf5326a81b42469da3d54de01
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 1 19:12:29 2010 +1000
s4:gensec Put the "NTLM" string for NTLMSSP's SASL name in a header
commit 2921a888dce74e8592ad4f7d51d92b8fa6d44711
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Aug 11 13:40:48 2010 +1000
s4-param: removed the lp_ varients of the functions
these made debugging much harder. We should replace these with
generated macros
commit 2a93814592f8177da38a6459bd447fab8575f4e3
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Aug 11 13:36:48 2010 +1000
s4-param: move back to auto-generation of loadparm prototypes
commit 837230f85e12e72186dacfb97fe2dbf8a37d28f0
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Jul 28 17:30:09 2010 +1000
s4-credentials: get all attributes in cli_credentials_set_secrets()
This ensures we get whenChanged, which is needed by the s3 winbind
code to ensure we don't repeatedly try to change the password
commit bc6a3a2e3f783b8a7dd87e72c55443fbfde12c00
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 11 19:42:17 2010 +1000
security.idl Clarify that this is not a network structure
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/security.idl | 1 +
nsswitch/libwbclient/wscript_build | 1 +
nsswitch/wscript_build | 2 +-
source3/include/auth.h | 2 +-
source4/auth/credentials/credentials_files.c | 18 +---
source4/auth/gensec/gensec.h | 2 +
source4/auth/ntlmssp/ntlmssp.c | 2 +-
source4/param/loadparm.c | 27 ++---
source4/param/param.h | 159 +-------------------------
source4/param/wscript_build | 3 +-
source4/rpc_server/lsa/dcesrv_lsa.c | 2 +-
source4/script/mkproto.pl | 6 +-
12 files changed, 25 insertions(+), 200 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index 13ccb49..266af49 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -569,6 +569,7 @@ interface security
[subcontext(4)] security_descriptor *sd;
} sec_desc_buf;
+ /* This is not yet sent over the network, but is simply defined in IDL */
typedef [public] struct {
uint32 num_sids;
[size_is(num_sids)] dom_sid sids[*];
diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index c6e48c5..4dd8cee 100644
--- a/nsswitch/libwbclient/wscript_build
+++ b/nsswitch/libwbclient/wscript_build
@@ -8,6 +8,7 @@ bld.SAMBA_SUBSYSTEM('LIBWBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBWBCLIENT_ASYNC',
source='wbc_async.c wbc_idmap_async.c wbc_pam_async.c wbc_sid_async.c wbc_util_async.c wb_reqtrans.c',
+ cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
public_deps='LIBASYNC_REQ tevent talloc UTIL_TEVENT LIBWBCLIENT',
)
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index f458776..4b62695 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -21,7 +21,7 @@ bld.SAMBA_BINARY('wbinfo',
bld.SAMBA_LIBRARY('nsswinbind',
source='../nsswitch/winbind_nss_linux.c',
deps='LIBWINBIND-CLIENT',
- realname='libnss_winbind.so',
+ realname='libnss_winbind.so.2',
vnum='2')
if bld.CONFIG_SET('HAVE_PAM_START'):
diff --git a/source3/include/auth.h b/source3/include/auth.h
index 94bd026..a123a3b 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -43,7 +43,7 @@ struct auth_serversupplied_info {
* and is set from the Kerberos session key using
* krb5_auth_con_getremotesubkey().
*
- * Bootom line, it is not the same as the session keys in info3.
+ * Bottom line, it is not the same as the session keys in info3.
*/
DATA_BLOB user_session_key;
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index e0fd052..8ad395d 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -185,22 +185,6 @@ _PUBLIC_ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
int ldb_ret;
struct ldb_message *msg;
- const char *attrs[] = {
- "secret",
- "priorSecret",
- "samAccountName",
- "flatname",
- "realm",
- "secureChannelType",
- "unicodePwd",
- "msDS-KeyVersionNumber",
- "saltPrincipal",
- "privateKeytab",
- "krb5Keytab",
- "servicePrincipalName",
- "ldapBindDn",
- NULL
- };
const char *machine_account;
const char *password;
@@ -235,7 +219,7 @@ _PUBLIC_ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
ldb_ret = dsdb_search_one(ldb, ldb, &msg,
ldb_dn_new(mem_ctx, ldb, base),
LDB_SCOPE_SUBTREE,
- attrs, 0, "%s", filter);
+ NULL, 0, "%s", filter);
if (ldb_ret != LDB_SUCCESS) {
*error_string = talloc_asprintf(cred, "Could not find entry to match filter: '%s' base: '%s': %s: %s\n",
diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 886f8fb..62d8a45 100644
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -26,6 +26,8 @@
#include "../lib/util/data_blob.h"
#include "libcli/util/ntstatus.h"
+#define GENSEC_SASL_NAME_NTLMSSP "NTLM"
+
#define GENSEC_OID_NTLMSSP "1.3.6.1.4.1.311.2.2.10"
#define GENSEC_OID_SPNEGO "1.3.6.1.5.5.2"
#define GENSEC_OID_KERBEROS5 "1.2.840.113554.1.2.2"
diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c
index 24da167..1a15d31 100644
--- a/source4/auth/ntlmssp/ntlmssp.c
+++ b/source4/auth/ntlmssp/ntlmssp.c
@@ -274,7 +274,7 @@ static const char *gensec_ntlmssp_oids[] = {
static const struct gensec_security_ops gensec_ntlmssp_security_ops = {
.name = "ntlmssp",
- .sasl_name = "NTLM",
+ .sasl_name = GENSEC_SASL_NAME_NTLMSSP, /* "NTLM" */
.auth_type = DCERPC_AUTH_TYPE_NTLMSSP,
.oid = gensec_ntlmssp_oids,
.client_start = gensec_ntlmssp_client_start,
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 9d3c532..bbc8323 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -613,40 +613,31 @@ static struct loadparm_context *global_loadparm_context;
#define lpcfg_global_service(i) global_loadparm_context->services[i]
#define FN_GLOBAL_STRING(fn_name,var_name) \
- _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_string(lp_ctx->globals->var_name) : "";} \
- _PUBLIC_ const char *lp_ ## fn_name(void) { return lpcfg_ ## fn_name(global_loadparm_context); }
+ _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_string(lp_ctx->globals->var_name) : "";}
#define FN_GLOBAL_CONST_STRING(fn_name,var_name) \
- _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_ctx->globals->var_name : "";} \
- _PUBLIC_ const char *lp_ ## fn_name(void) { return lpcfg_ ## fn_name(global_loadparm_context); }
+ _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_ctx->globals->var_name : "";}
#define FN_GLOBAL_LIST(fn_name,var_name) \
- _PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name;} \
- _PUBLIC_ const char **lp_ ## fn_name(void) { return lpcfg_ ## fn_name(global_loadparm_context); }
+ _PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name;}
#define FN_GLOBAL_BOOL(fn_name,var_name) \
- _PUBLIC_ bool lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return false; return lp_ctx->globals->var_name;} \
- _PUBLIC_ bool lp_ ## fn_name(void) { return lpcfg_ ## fn_name(global_loadparm_context); }
+ _PUBLIC_ bool lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return false; return lp_ctx->globals->var_name;}
#define FN_GLOBAL_INTEGER(fn_name,var_name) \
- _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {return lp_ctx->globals->var_name;} \
- _PUBLIC_ int lp_ ## fn_name(void) { return lpcfg_ ## fn_name(global_loadparm_context); }
+ _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {return lp_ctx->globals->var_name;}
#define FN_LOCAL_STRING(fn_name,val) \
- _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->val)));} \
- _PUBLIC_ const char *lp_ ## fn_name(int i) { return lpcfg_ ## fn_name(lpcfg_global_service(i), lpcfg_default_service); }
+ _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->val)));}
#define FN_LOCAL_LIST(fn_name,val) \
- _PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return(const char **)(service != NULL && service->val != NULL? service->val : sDefault->val);} \
- _PUBLIC_ const char **lp_ ## fn_name(int i) { return lpcfg_ ## fn_name(lpcfg_global_service(i), lpcfg_default_service); }
+ _PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return(const char **)(service != NULL && service->val != NULL? service->val : sDefault->val);}
#define FN_LOCAL_BOOL(fn_name,val) \
- _PUBLIC_ bool lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);} \
- _PUBLIC_ bool lp_ ## fn_name(int i) { return lpcfg_ ## fn_name(lpcfg_global_service(i), lpcfg_default_service); }
+ _PUBLIC_ bool lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);}
#define FN_LOCAL_INTEGER(fn_name,val) \
- _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);} \
- _PUBLIC_ int lp_ ## fn_name(int i) { return lpcfg_ ## fn_name(lpcfg_global_service(i), lpcfg_default_service); }
+ _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);}
FN_GLOBAL_INTEGER(server_role, server_role)
FN_GLOBAL_INTEGER(sid_generator, sid_generator)
diff --git a/source4/param/param.h b/source4/param/param.h
index 15ea564..7441493 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -69,169 +69,14 @@ struct smbcli_options;
struct smbcli_session_options;
struct gensec_settings;
+#include "param/param_proto.h"
+
void reload_charcnv(struct loadparm_context *lp_ctx);
struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx);
struct parm_struct *lpcfg_parm_table(void);
-#define DECL_GLOBAL_STRING(fn_name) \
- const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx); \
- const char *lp_ ## fn_name(void)
-
-#define DECL_GLOBAL_CONST_STRING(fn_name) \
- const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx); \
- const char *lp_ ## fn_name(void)
-
-#define DECL_GLOBAL_LIST(fn_name) \
- const char **lpcfg_ ## fn_name(struct loadparm_context *lp_ctx); \
- const char **lp_ ## fn_name(void)
-
-#define DECL_GLOBAL_BOOL(fn_name) \
- bool lpcfg_ ## fn_name(struct loadparm_context *lp_ctx); \
- bool lp_ ## fn_name(void)
-
-#define DECL_GLOBAL_INTEGER(fn_name) \
- int lpcfg_ ## fn_name(struct loadparm_context *lp_ctx); \
- int lp_ ## fn_name(void)
-
-#define DECL_LOCAL_STRING(fn_name) \
- const char *lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault); \
- const char *lp_ ## fn_name(int i)
-
-#define DECL_LOCAL_LIST(fn_name) \
- const char **lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault); \
- const char **lp_ ## fn_name(int i)
-
-#define DECL_LOCAL_BOOL(fn_name) \
- bool lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault); \
- bool lp_ ## fn_name(int i)
-
-#define DECL_LOCAL_INTEGER(fn_name) \
- int lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault); \
- int lp_ ## fn_name(int i)
-
-
-DECL_GLOBAL_INTEGER(server_role);
-DECL_GLOBAL_INTEGER(sid_generator);
-DECL_GLOBAL_LIST(smb_ports);
-DECL_GLOBAL_INTEGER(nbt_port);
-DECL_GLOBAL_INTEGER(dgram_port);
-DECL_GLOBAL_INTEGER(cldap_port);
-DECL_GLOBAL_INTEGER(krb5_port);
-DECL_GLOBAL_INTEGER(kpasswd_port);
-DECL_GLOBAL_INTEGER(web_port);
-DECL_GLOBAL_BOOL(tls_enabled);
-DECL_GLOBAL_STRING(share_backend);
-DECL_GLOBAL_STRING(sam_url);
-DECL_GLOBAL_STRING(idmap_url);
-DECL_GLOBAL_STRING(secrets_url);
-DECL_GLOBAL_STRING(spoolss_url);
-DECL_GLOBAL_STRING(wins_config_url);
-DECL_GLOBAL_STRING(wins_url);
-DECL_GLOBAL_CONST_STRING(winbind_separator);
-DECL_GLOBAL_CONST_STRING(winbindd_socket_directory);
-DECL_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory);
-DECL_GLOBAL_CONST_STRING(template_shell);
-DECL_GLOBAL_CONST_STRING(template_homedir);
-DECL_GLOBAL_BOOL(winbind_sealed_pipes);
-DECL_GLOBAL_BOOL(idmap_trusted_only);
-DECL_GLOBAL_STRING(private_dir);
-DECL_GLOBAL_STRING(serverstring);
-DECL_GLOBAL_STRING(lockdir);
-DECL_GLOBAL_STRING(modulesdir);
-DECL_GLOBAL_STRING(setupdir);
-DECL_GLOBAL_STRING(ncalrpc_dir);
-DECL_GLOBAL_STRING(dos_charset);
-DECL_GLOBAL_STRING(unix_charset);
-DECL_GLOBAL_STRING(display_charset);
-DECL_GLOBAL_STRING(piddir);
-DECL_GLOBAL_LIST(rndc_command);
-DECL_GLOBAL_LIST(dns_update_command);
-DECL_GLOBAL_LIST(spn_update_command);
-DECL_GLOBAL_STRING(nsupdate_command);
-DECL_GLOBAL_LIST(dcerpc_endpoint_servers);
-DECL_GLOBAL_LIST(server_services);
-DECL_GLOBAL_STRING(ntptr_providor);
-DECL_GLOBAL_STRING(auto_services);
-DECL_GLOBAL_STRING(passwd_chat);
-DECL_GLOBAL_LIST(passwordserver);
-DECL_GLOBAL_LIST(name_resolve_order);
-DECL_GLOBAL_STRING(realm);
-DECL_GLOBAL_STRING(dnsdomain);
-DECL_GLOBAL_STRING(socket_options);
-DECL_GLOBAL_STRING(workgroup);
-DECL_GLOBAL_STRING(netbios_name);
-DECL_GLOBAL_STRING(netbios_scope);
-DECL_GLOBAL_LIST(wins_server_list);
-DECL_GLOBAL_LIST(interfaces);
-DECL_GLOBAL_STRING(socket_address);
-DECL_GLOBAL_LIST(netbios_aliases);
-DECL_GLOBAL_BOOL(disable_netbios);
-DECL_GLOBAL_BOOL(wins_support);
-DECL_GLOBAL_BOOL(wins_dns_proxy);
-DECL_GLOBAL_STRING(wins_hook);
-DECL_GLOBAL_BOOL(local_master);
-DECL_GLOBAL_BOOL(readraw);
-DECL_GLOBAL_BOOL(large_readwrite);
-DECL_GLOBAL_BOOL(writeraw);
-DECL_GLOBAL_BOOL(null_passwords);
-DECL_GLOBAL_BOOL(obey_pam_restrictions);
-DECL_GLOBAL_BOOL(encrypted_passwords);
-DECL_GLOBAL_BOOL(time_server);
-DECL_GLOBAL_BOOL(bind_interfaces_only);
-DECL_GLOBAL_BOOL(unicode);
-DECL_GLOBAL_BOOL(nt_status_support);
-DECL_GLOBAL_BOOL(lanman_auth);
-DECL_GLOBAL_BOOL(ntlm_auth);
-DECL_GLOBAL_BOOL(client_plaintext_auth);
-DECL_GLOBAL_BOOL(client_lanman_auth);
-DECL_GLOBAL_BOOL(client_ntlmv2_auth);
-DECL_GLOBAL_BOOL(client_use_spnego_principal);
-DECL_GLOBAL_BOOL(host_msdfs);
-DECL_GLOBAL_BOOL(unix_extensions);
-DECL_GLOBAL_BOOL(use_spnego);
-DECL_GLOBAL_BOOL(rpc_big_endian);
-DECL_GLOBAL_INTEGER(max_wins_ttl);
-DECL_GLOBAL_INTEGER(min_wins_ttl);
-DECL_GLOBAL_INTEGER(maxmux);
-DECL_GLOBAL_INTEGER(max_xmit);
-DECL_GLOBAL_INTEGER(passwordlevel);
-DECL_GLOBAL_INTEGER(srv_maxprotocol);
-DECL_GLOBAL_INTEGER(srv_minprotocol);
-DECL_GLOBAL_INTEGER(cli_maxprotocol);
-DECL_GLOBAL_INTEGER(cli_minprotocol);
-DECL_GLOBAL_INTEGER(security);
-DECL_GLOBAL_BOOL(paranoid_server_security);
-DECL_GLOBAL_INTEGER(announce_as);
-DECL_LOCAL_STRING(pathname);
-DECL_LOCAL_LIST(hostsallow);
-DECL_LOCAL_LIST(hostsdeny);
-DECL_LOCAL_STRING(comment);
-DECL_LOCAL_STRING(fstype);
-DECL_LOCAL_LIST(ntvfs_handler);
-DECL_LOCAL_BOOL(msdfs_root);
-DECL_LOCAL_BOOL(browseable);
-DECL_LOCAL_BOOL(readonly);
-DECL_LOCAL_BOOL(print_ok);
-DECL_LOCAL_BOOL(map_hidden);
-DECL_LOCAL_BOOL(map_archive);
-DECL_LOCAL_BOOL(strict_locking);
-DECL_LOCAL_BOOL(oplocks);
-DECL_LOCAL_BOOL(strict_sync);
-DECL_LOCAL_BOOL(ci_filesystem);
-DECL_LOCAL_BOOL(map_system);
-DECL_LOCAL_INTEGER(max_connections);
-DECL_LOCAL_INTEGER(csc_policy);
-DECL_LOCAL_INTEGER(create_mask);
-DECL_LOCAL_INTEGER(force_create_mode);
-DECL_LOCAL_INTEGER(dir_mask);
-DECL_LOCAL_INTEGER(force_dir_mode);
-DECL_GLOBAL_INTEGER(server_signing);
-DECL_GLOBAL_INTEGER(client_signing);
-DECL_GLOBAL_CONST_STRING(ntp_signd_socket_directory);
-
-
char *lpcfg_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
char *lpcfg_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
char *lpcfg_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 89929f1..0f0f1d0 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -6,7 +6,8 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG',
vnum='0.0.1',
deps='DYNCONFIG CHARSET',
public_deps='LIBSAMBA-UTIL',
- public_headers='param.h'
+ public_headers='param.h',
+ autoproto='param_proto.h'
)
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 81ad6f7..74c2859 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -312,7 +312,7 @@ static NTSTATUS dcesrv_lsa_EnumPrivs(struct dcesrv_call_state *dce_call, TALLOC_
return NT_STATUS_NO_MEMORY;
}
e = &r->out.privs->privs[r->out.privs->count];
- e->luid.low = i;
+ e->luid.low = priv;
e->luid.high = 0;
e->name.string = privname;
r->out.privs->count++;
diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl
index 5930788..4760e63 100755
--- a/source4/script/mkproto.pl
+++ b/source4/script/mkproto.pl
@@ -128,7 +128,7 @@ sub handle_loadparm($$)
{
my ($file,$line) = @_;
- if ($line =~ /^_PUBLIC_ FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),.*\)/o) {
+ if ($line =~ /^FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),.*\)/o) {
my $scope = $1;
my $type = $2;
my $name = $3;
@@ -147,7 +147,7 @@ sub handle_loadparm($$)
"LOCAL" => "struct loadparm_service *, struct loadparm_service *"
);
- $file->("$tmap{$type}$name($smap{$scope});\n");
+ $file->("$tmap{$type}lpcfg_$name($smap{$scope});\n");
}
}
@@ -190,7 +190,7 @@ sub process_file($$$)
next if ($line =~ /^\/|[;]/);
- if ($line =~ /^_PUBLIC_ FN_/) {
+ if ($line =~ /^FN_/) {
handle_loadparm($public_file, $line);
handle_loadparm($private_file, $line);
next;
--
Samba Shared Repository
More information about the samba-cvs
mailing list