The branch, master has been updated
via 9f02fb5 s4:rpc_server/dcesrv_samr.c - quiet enum warnings
via 260bc98 s4:ntvfs subsystem - quiet enum warnings
via 40ea52a s4:libnet/libnet_rpc.c - quiet an enum warning
via 49352ca s4:winbind/wb_samba3_protocol.c - quiet enum warning
via 26c7223 s4:schema_convert_to_ol.c - fix memory contexts
via 87a38d7 s4:dsdb/schema_convert_to_ol.c - quiet enum warning
via 27f1779 s4:auth/ntlm/auth.c - fix incompatible pointer type warning
via 530d1e3 s3:auth/auth_samba4.c - remove unused variable
via 059e735 s3:passdb/pdb_samba4.c - remove unused variable
via d6fe38b s4:smbd/server.c - quiet "time_t" format string warnings by
casts
via 4d0c00b s3:passdb/pdb_samba4.c - fix a format specifier warning
via 7ebafb0 s4:librpc/rpc/dcerpc.c - janitorial: use "void" for
functions without arguments
via ba5cec5 ldb:ldb_msg.c - move away from "errno"
from 516dc40 samba-tool: added --local option to drs replicate command
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9f02fb51d41c2c2bf285ab6d25138f0b7b0cba81
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Jun 8 19:02:37 2011 +0200
s4:rpc_server/dcesrv_samr.c - quiet enum warnings
When we are acting in the role of a PDC then please return it as status
information.
Reviewed-by: Tridge
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Thu Jun 9 12:06:36 CEST 2011 on sn-devel-104
commit 260bc987b00b3fff6c9b99211627b14e9bd0789a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Jun 8 19:00:18 2011 +0200
s4:ntvfs subsystem - quiet enum warnings
Simply return "NT_STATUS_INVALID_LEVEL" for unknown types of requests.
Reviewed-by: Tridge
commit 40ea52a267c7362e206ac83ff6d1fc586b05e2f4
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Jun 8 18:58:45 2011 +0200
s4:libnet/libnet_rpc.c - quiet an enum warning
Other enum types have been checked before.
Reviewed-by: Tridge
commit 49352cafb4259503e6afb44d38db9bfd525d5e0d
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Jun 8 18:57:00 2011 +0200
s4:winbind/wb_samba3_protocol.c - quiet enum warning
Don't enumerate all unimplemented types of call which simply leads to
incompleteness.
Reviewed-by: Tridge
commit 26c7223e7240a5d4a2b39b14b47c0e66b7c089c9
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Jun 9 09:17:16 2011 +0200
s4:schema_convert_to_ol.c - fix memory contexts
- Add more "mem_ctx" free functions on error cases
- Steal the "out" string directly onto the LDB context to be able to free
the local "mem_ctx"
Reviewed-by: Tridge
commit 87a38d77ac899d8b6e21c7bcaeb8d4b74ed65341
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Jun 8 18:55:23 2011 +0200
s4:dsdb/schema_convert_to_ol.c - quiet enum warning
Introduce a error message when choosing wrong targets.
Reviewed-by: Tridge
commit 27f1779814accd82a5ec1330f8856192a69271f8
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Jun 8 09:36:59 2011 +0200
s4:auth/ntlm/auth.c - fix incompatible pointer type warning
Reviewed-by: Tridge
commit 530d1e33f7ea565e5668ebe609f049fa6a69871b
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Jun 8 19:04:48 2011 +0200
s3:auth/auth_samba4.c - remove unused variable
Reviewed-by: Tridge
commit 059e735e4167477f7f183aae3ec517b31ca4700f
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Jun 6 22:41:18 2011 +0200
s3:passdb/pdb_samba4.c - remove unused variable
Reviewed-by: Tridge
commit d6fe38b99dde9abc91a3806ece93930e5530dda7
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Jun 6 22:40:20 2011 +0200
s4:smbd/server.c - quiet "time_t" format string warnings by casts
Reviewed-by: Tridge
commit 4d0c00bb33ec9fe54b8e87491001047d06525c70
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Jun 6 22:34:00 2011 +0200
s3:passdb/pdb_samba4.c - fix a format specifier warning
Reviewed-by: Tridge
commit 7ebafb000a79e9317b267ae09b9fa9b0685b9209
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Jun 6 12:50:16 2011 +0200
s4:librpc/rpc/dcerpc.c - janitorial: use "void" for functions without
arguments
Probably a mistake in commit 907cdb5de7f16a2540299aeba211bf2a5ae6fafe.
Reviewed-by: Tridge
commit ba5cec58049fd9ca8cb9d0d1706ed2e34328335f
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu May 26 09:25:16 2011 +0200
ldb:ldb_msg.c - move away from "errno"
Reviewed-by: Tridge
-----------------------------------------------------------------------
Summary of changes:
source3/auth/auth_samba4.c | 1 -
source3/passdb/pdb_samba4.c | 3 +--
source4/auth/ntlm/auth.c | 4 ++--
source4/dsdb/schema/schema_convert_to_ol.c | 19 +++++++++++++++++++
source4/lib/ldb/common/ldb_msg.c | 3 ---
source4/libnet/libnet_rpc.c | 4 ++++
source4/librpc/rpc/dcerpc.c | 2 +-
source4/ntvfs/ntvfs_generic.c | 15 +++++----------
source4/ntvfs/posix/pvfs_qfileinfo.c | 7 +++----
source4/ntvfs/posix/pvfs_search.c | 6 ++----
source4/rpc_server/samr/dcesrv_samr.c | 6 ++++++
source4/smbd/server.c | 6 ++++--
source4/torture/gentest.c | 10 +---------
source4/winbind/wb_samba3_protocol.c | 25 +++----------------------
14 files changed, 51 insertions(+), 60 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c
index a4673db..1b27e7b 100644
--- a/source3/auth/auth_samba4.c
+++ b/source3/auth/auth_samba4.c
@@ -40,7 +40,6 @@ static NTSTATUS check_samba4_security(const struct
auth_context *auth_context,
struct auth_user_info_dc *user_info_dc;
struct auth4_context *auth4_context;
struct loadparm_context *lp_ctx;
- const char *config_file;
lp_ctx = loadparm_init_s3(frame, loadparm_s3_context());
if (lp_ctx == NULL) {
diff --git a/source3/passdb/pdb_samba4.c b/source3/passdb/pdb_samba4.c
index b8b11e4..5848c23 100644
--- a/source3/passdb/pdb_samba4.c
+++ b/source3/passdb/pdb_samba4.c
@@ -325,7 +325,7 @@ static bool pdb_samba4_add_time(struct ldb_message *msg,
unix_to_nt_time(&nt_time, t);
- return ldb_msg_add_fmt(msg, attrib, "%llu", nt_time);
+ return ldb_msg_add_fmt(msg, attrib, "%llu", (unsigned long long)
nt_time);
}
/* Like in pdb_ldap(), this will need to be a function pointer when we
@@ -2041,7 +2041,6 @@ static NTSTATUS pdb_init_samba4(struct pdb_methods
**pdb_method,
struct pdb_methods *m;
struct pdb_samba4_state *state;
NTSTATUS status;
- char *config_file;
if ( !NT_STATUS_IS_OK(status = make_pdb_method( &m )) ) {
return status;
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 2308b15..d2464c3 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -487,7 +487,7 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX
*mem_ctx, const char **
const char **auth_methods_from_lp(TALLOC_CTX *mem_ctx, struct loadparm_context
*lp_ctx)
{
- const char **auth_methods = NULL;
+ char **auth_methods = NULL;
switch (lpcfg_server_role(lp_ctx)) {
case ROLE_STANDALONE:
@@ -501,7 +501,7 @@ const char **auth_methods_from_lp(TALLOC_CTX *mem_ctx,
struct loadparm_context *
auth_methods = str_list_make(mem_ctx, "anonymous
sam_ignoredomain winbind", NULL);
break;
}
- return auth_methods;
+ return (const char **) auth_methods;
}
/***************************************************************************
diff --git a/source4/dsdb/schema/schema_convert_to_ol.c
b/source4/dsdb/schema/schema_convert_to_ol.c
index 77a9b1f..0e42f20 100644
--- a/source4/dsdb/schema/schema_convert_to_ol.c
+++ b/source4/dsdb/schema/schema_convert_to_ol.c
@@ -134,6 +134,7 @@ static char *print_schema_recursive(char *append_to_string,
struct dsdb_schema *
may,
NULL);
if (schema_entry == NULL) {
+ talloc_free(mem_ctx);
DEBUG(0, ("failed to generate schema description for
%s\n", name));
return NULL;
}
@@ -145,6 +146,10 @@ static char *print_schema_recursive(char
*append_to_string, struct dsdb_schema *
case TARGET_FEDORA_DS:
out = talloc_asprintf_append(out, "objectClasses:
%s\n", schema_entry);
break;
+ default:
+ talloc_free(mem_ctx);
+ DEBUG(0,(__location__ " Wrong type of target %u!",
(unsigned)target));
+ return NULL;
}
talloc_free(mem_ctx);
} while (0);
@@ -199,6 +204,7 @@ char *dsdb_convert_schema_to_openldap(struct ldb_context
*ldb, char *target_str,
} else if (strcasecmp(target_str, "fedora-ds") == 0) {
target = TARGET_FEDORA_DS;
} else {
+ talloc_free(mem_ctx);
DEBUG(0, ("Invalid target type for schema conversion %s\n",
target_str));
return NULL;
}
@@ -263,6 +269,7 @@ char *dsdb_convert_schema_to_openldap(struct ldb_context
*ldb, char *target_str,
schema = dsdb_get_schema(ldb, mem_ctx);
if (!schema) {
+ talloc_free(mem_ctx);
DEBUG(0, ("No schema on ldb to convert!\n"));
return NULL;
}
@@ -274,6 +281,10 @@ char *dsdb_convert_schema_to_openldap(struct ldb_context
*ldb, char *target_str,
case TARGET_FEDORA_DS:
out = talloc_strdup(mem_ctx, "dn: cn=schema\n");
break;
+ default:
+ talloc_free(mem_ctx);
+ DEBUG(0,(__location__ " Wrong type of target %u!",
(unsigned)target));
+ return NULL;
}
for (attribute=schema->attributes; attribute; attribute =
attribute->next) {
@@ -339,6 +350,7 @@ char *dsdb_convert_schema_to_openldap(struct ldb_context
*ldb, char *target_str,
false, false);
if (schema_entry == NULL) {
+ talloc_free(mem_ctx);
DEBUG(0, ("failed to generate attribute description for
%s\n", name));
return NULL;
}
@@ -350,11 +362,18 @@ char *dsdb_convert_schema_to_openldap(struct ldb_context
*ldb, char *target_str,
case TARGET_FEDORA_DS:
out = talloc_asprintf_append(out, "attributeTypes:
%s\n", schema_entry);
break;
+ default:
+ talloc_free(mem_ctx);
+ DEBUG(0,(__location__ " Wrong type of target %u!",
(unsigned)target));
+ return NULL;
}
}
out = print_schema_recursive(out, schema, "top", target, attrs_skip,
attr_map, oid_map);
+ talloc_steal(ldb, out);
+ talloc_free(mem_ctx);
+
return out;
}
diff --git a/source4/lib/ldb/common/ldb_msg.c b/source4/lib/ldb/common/ldb_msg.c
index 9c5a279..28c414e 100644
--- a/source4/lib/ldb/common/ldb_msg.c
+++ b/source4/lib/ldb/common/ldb_msg.c
@@ -130,7 +130,6 @@ static int _ldb_msg_add_el(struct ldb_message *msg,
els = talloc_realloc(msg, msg->elements,
struct ldb_message_element, msg->num_elements + 1);
if (!els) {
- errno = ENOMEM;
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -164,7 +163,6 @@ int ldb_msg_add_empty(struct ldb_message *msg,
el->flags = flags;
el->name = talloc_strdup(msg->elements, attr_name);
if (!el->name) {
- errno = ENOMEM;
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -229,7 +227,6 @@ int ldb_msg_add_value(struct ldb_message *msg,
vals = talloc_realloc(msg->elements, el->values, struct ldb_val,
el->num_values+1);
if (!vals) {
- errno = ENOMEM;
return LDB_ERR_OPERATIONS_ERROR;
}
el->values = vals;
diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index e0781c3..8aacfc3 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -109,6 +109,10 @@ static struct composite_context*
libnet_RpcConnectSrv_send(struct libnet_context
case LIBNET_RPC_CONNECT_SERVER:
case LIBNET_RPC_CONNECT_SERVER_ADDRESS:
b->flags = r->in.dcerpc_flags;
+ break;
+ default:
+ /* other types have already been checked before */
+ break;
}
if (DEBUGLEVEL >= 10) {
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index c199dc7..110da57 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -76,7 +76,7 @@ struct rpc_request {
} async;
};
-_PUBLIC_ NTSTATUS dcerpc_init()
+_PUBLIC_ NTSTATUS dcerpc_init(void)
{
return gensec_init();
}
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 8e1eb0b..9aa8e04 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -576,9 +576,6 @@ static NTSTATUS ntvfs_map_fsinfo_finish(struct
ntvfs_module_context *ntvfs,
/* and convert it to the required level */
switch (fs->generic.level) {
- case RAW_QFS_GENERIC:
- return NT_STATUS_INVALID_LEVEL;
-
case RAW_QFS_DSKATTR: {
/* map from generic to DSKATTR */
unsigned int bpunit = 64;
@@ -666,10 +663,10 @@ static NTSTATUS ntvfs_map_fsinfo_finish(struct
ntvfs_module_context *ntvfs,
fs->objectid_information.out.guid = fs2->generic.out.guid;
ZERO_STRUCT(fs->objectid_information.out.unknown);
return NT_STATUS_OK;
- }
-
- return NT_STATUS_INVALID_LEVEL;
+ default:
+ return NT_STATUS_INVALID_LEVEL;
+ }
}
/*
@@ -715,8 +712,6 @@ NTSTATUS ntvfs_map_fileinfo(TALLOC_CTX *mem_ctx,
int i;
/* and convert it to the required level using results in info2 */
switch (info->generic.level) {
- case RAW_FILEINFO_GENERIC:
- return NT_STATUS_INVALID_LEVEL;
case RAW_FILEINFO_GETATTR:
info->getattr.out.attrib = info2->generic.out.attrib & 0xff;
info->getattr.out.size = info2->generic.out.size;
@@ -931,9 +926,9 @@ NTSTATUS ntvfs_map_fileinfo(TALLOC_CTX *mem_ctx,
info->unix_link_info.out.link_dest =
info2->generic.out.link_dest;
return NT_STATUS_OK;
#endif
+ default:
+ return NT_STATUS_INVALID_LEVEL;
}
-
- return NT_STATUS_INVALID_LEVEL;
}
/*
diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c
b/source4/ntvfs/posix/pvfs_qfileinfo.c
index e54fc2d..515819b 100644
--- a/source4/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_qfileinfo.c
@@ -149,9 +149,6 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs,
int fd)
{
switch (info->generic.level) {
- case RAW_FILEINFO_GENERIC:
- return NT_STATUS_INVALID_LEVEL;
-
case RAW_FILEINFO_GETATTR:
info->getattr.out.attrib = name->dos.attrib;
info->getattr.out.size = name->st.st_size;
@@ -333,9 +330,11 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs,
name->original_name);
NT_STATUS_HAVE_NO_MEMORY(info->all_info2.out.fname.s);
return NT_STATUS_OK;
+
+ default:
+ return NT_STATUS_INVALID_LEVEL;
}
- return NT_STATUS_INVALID_LEVEL;
}
/*
diff --git a/source4/ntvfs/posix/pvfs_search.c
b/source4/ntvfs/posix/pvfs_search.c
index a050de1..668f8d7 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -220,11 +220,9 @@ static NTSTATUS fill_search_info(struct pvfs_state *pvfs,
file->id_both_directory_info.name.s = fname;
return NT_STATUS_OK;
- case RAW_SEARCH_DATA_GENERIC:
- break;
+ default:
+ return NT_STATUS_INVALID_LEVEL;
}
-
- return NT_STATUS_INVALID_LEVEL;
}
diff --git a/source4/rpc_server/samr/dcesrv_samr.c
b/source4/rpc_server/samr/dcesrv_samr.c
index 62f56eb..32aafcd 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -510,6 +510,9 @@ static NTSTATUS
dcesrv_samr_info_DomGeneralInformation(struct samr_domain_state
info->role = SAMR_ROLE_DOMAIN_BDC;
}
break;
+ case ROLE_DOMAIN_PDC:
+ info->role = SAMR_ROLE_DOMAIN_PDC;
+ break;
case ROLE_DOMAIN_MEMBER:
info->role = SAMR_ROLE_DOMAIN_MEMBER;
break;
@@ -613,6 +616,9 @@ static NTSTATUS dcesrv_samr_info_DomInfo7(struct
samr_domain_state *state,
info->role = SAMR_ROLE_DOMAIN_BDC;
}
break;
+ case ROLE_DOMAIN_PDC:
+ info->role = SAMR_ROLE_DOMAIN_PDC;
+ break;
case ROLE_DOMAIN_MEMBER:
info->role = SAMR_ROLE_DOMAIN_MEMBER;
break;
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 6acccd1..1be3b28 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -178,7 +178,8 @@ _NORETURN_ static void max_runtime_handler(struct
tevent_context *ev,
struct timeval t, void *private_data)
{
const char *binary_name = (const char *)private_data;
- DEBUG(0,("%s: maximum runtime exceeded - terminating, current ts:
%d\n", binary_name, time(NULL)));
+ DEBUG(0,("%s: maximum runtime exceeded - terminating, current ts:
%llu\n",
+ binary_name, (unsigned long long) time(NULL)));
exit(0);
}
@@ -438,7 +439,8 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
discard_const(binary_name));
if (max_runtime) {
- DEBUG(0,("Called with maxruntime %d - current ts %d\n",
max_runtime, time(NULL)));
+ DEBUG(0,("Called with maxruntime %d - current ts %llu\n",
+ max_runtime, (unsigned long long) time(NULL)));
tevent_add_timer(event_ctx, event_ctx,
timeval_current_ofs(max_runtime, 0),
max_runtime_handler,
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 37ae2c0..28e6953 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -2309,15 +2309,7 @@ static void gen_setfileinfo(int instance, union
smb_setfileinfo *info)
info->full_ea_information.in.eas = gen_ea_list();
break;
- case RAW_SFILEINFO_GENERIC:
- case RAW_SFILEINFO_SEC_DESC:
- case RAW_SFILEINFO_1025:
- case RAW_SFILEINFO_1029:
- case RAW_SFILEINFO_1032:
- case RAW_SFILEINFO_UNIX_BASIC:
- case RAW_SFILEINFO_UNIX_INFO2:
- case RAW_SFILEINFO_UNIX_LINK:
- case RAW_SFILEINFO_UNIX_HLINK:
+ default:
/* Untested */
break;
}
diff --git a/source4/winbind/wb_samba3_protocol.c
b/source4/winbind/wb_samba3_protocol.c
index 4bb0582..95861d1 100644
--- a/source4/winbind/wb_samba3_protocol.c
+++ b/source4/winbind/wb_samba3_protocol.c
@@ -179,28 +179,9 @@ NTSTATUS wbsrv_samba3_handle_call(struct wbsrv_samba3_call
*s3call)
return wbsrv_samba3_pam_logoff(s3call);
/* Unimplemented commands */
- case WINBINDD_GETPWSID:
- case WINBINDD_PAM_CHAUTHTOK:
- case WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP:
- case WINBINDD_LOOKUPRIDS:
- case WINBINDD_SIDS_TO_XIDS:
- case WINBINDD_ALLOCATE_UID:
- case WINBINDD_ALLOCATE_GID:
- case WINBINDD_SHOW_SEQUENCE:
- case WINBINDD_WINS_BYIP:
- case WINBINDD_WINS_BYNAME:
- case WINBINDD_GETGRLST:
- case WINBINDD_GETSIDALIASES:
- case WINBINDD_DSGETDCNAME:
- case WINBINDD_INIT_CONNECTION:
- case WINBINDD_DUAL_SIDS2XIDS:
- case WINBINDD_DUAL_USERINFO:
- case WINBINDD_DUAL_GETSIDALIASES:
- case WINBINDD_DUAL_NDRCMD:
- case WINBINDD_CCACHE_NTLMAUTH:
- case WINBINDD_NUM_CMDS:
- DEBUG(10, ("Unimplemented winbind samba3 request %d\n",
- s3call->request->cmd));
+ default:
+ DEBUG(4, ("Unimplemented winbind samba3 request %d\n",
+ s3call->request->cmd));
break;
}
--
Samba Shared Repository
