remove compiler warnings and remove a few allow_warnings=True
Stefan (metze) Metzmacher
metze at samba.org
Wed Mar 18 14:35:53 MDT 2015
Hi,
here're some patches to cleanup compiler warnings
and remove some allow_warnings=True in server related code.
Please review and push...
Thanks!
metze
-------------- next part --------------
From 8ca023df81275a08125dd3dbd04a0df3bfcf1f4f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 09:50:44 +0100
Subject: [PATCH 01/14] libcli/auth: add forward declaration for struct
wkssvc_PasswordBuffer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
libcli/auth/proto.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
index 0c319d3..6687e1d 100644
--- a/libcli/auth/proto.h
+++ b/libcli/auth/proto.h
@@ -189,6 +189,7 @@ bool set_pw_in_buffer(uint8_t buffer[516], DATA_BLOB *password);
************************************************************/
bool extract_pw_from_buffer(TALLOC_CTX *mem_ctx,
uint8_t in_buffer[516], DATA_BLOB *new_pass);
+struct wkssvc_PasswordBuffer;
void encode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
const char *pwd,
DATA_BLOB *session_key,
--
1.9.1
From 5e887b30ce7617f8cff404fd3a0604826c1663a2 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 09:51:16 +0100
Subject: [PATCH 02/14] s3:libnet: remove unused variables
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source3/libnet/libnet_dssync_passdb.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index 22eff90..5617776 100644
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -1119,7 +1119,6 @@ static NTSTATUS sam_account_from_object(struct samu *account,
const char *profilePath;
const char *description;
const char *userWorkstations;
- const char *comment;
DATA_BLOB userParameters;
struct dom_sid objectSid;
uint32_t primaryGroupID;
@@ -1151,7 +1150,6 @@ static NTSTATUS sam_account_from_object(struct samu *account,
GET_STRING(profilePath);
GET_STRING(description);
GET_STRING(userWorkstations);
- GET_STRING(comment);
GET_BLOB(userParameters);
GET_UINT32(primaryGroupID);
GET_UINT32(userAccountControl);
@@ -1367,12 +1365,10 @@ static NTSTATUS handle_account_object(struct dssync_passdb *pctx,
uint32_t rid;
const char *sAMAccountName;
- uint32_t sAMAccountType;
uint32_t userAccountControl;
user_sid = cur->object.identifier->sid;
GET_STRING_EX(sAMAccountName, true);
- GET_UINT32_EX(sAMAccountType, true);
GET_UINT32_EX(userAccountControl, true);
status = dom_sid_split_rid(mem_ctx, &user_sid, NULL, &rid);
@@ -1489,8 +1485,6 @@ static NTSTATUS handle_alias_object(struct dssync_passdb *pctx,
bool insert = true;
const char *sAMAccountName;
- uint32_t sAMAccountType;
- uint32_t groupType;
const char *description;
uint32_t i;
uint32_t num_members = 0;
@@ -1498,8 +1492,6 @@ static NTSTATUS handle_alias_object(struct dssync_passdb *pctx,
group_sid = cur->object.identifier->sid;
GET_STRING_EX(sAMAccountName, true);
- GET_UINT32_EX(sAMAccountType, true);
- GET_UINT32_EX(groupType, true);
GET_STRING(description);
status = find_drsuapi_attr_dn(obj, cur, DRSUAPI_ATTID_member,
@@ -1628,8 +1620,6 @@ static NTSTATUS handle_group_object(struct dssync_passdb *pctx,
bool insert = true;
const char *sAMAccountName;
- uint32_t sAMAccountType;
- uint32_t groupType;
const char *description;
uint32_t i;
uint32_t num_members = 0;
@@ -1637,8 +1627,6 @@ static NTSTATUS handle_group_object(struct dssync_passdb *pctx,
group_sid = cur->object.identifier->sid;
GET_STRING_EX(sAMAccountName, true);
- GET_UINT32_EX(sAMAccountType, true);
- GET_UINT32_EX(groupType, true);
GET_STRING(description);
status = find_drsuapi_attr_dn(obj, cur, DRSUAPI_ATTID_member,
@@ -1781,7 +1769,6 @@ static NTSTATUS parse_object(struct dssync_passdb *pctx,
struct drsuapi_DsReplicaAttribute *attr;
char *name = NULL;
- uint32_t uacc = 0;
uint32_t sam_type = 0;
DEBUG(3, ("parsing object '%s'\n", cur->object.identifier->dn));
@@ -1809,9 +1796,6 @@ static NTSTATUS parse_object(struct dssync_passdb *pctx,
case DRSUAPI_ATTID_sAMAccountType:
sam_type = IVAL(blob->data, 0);
break;
- case DRSUAPI_ATTID_userAccountControl:
- uacc = IVAL(blob->data, 0);
- break;
default:
break;
}
--
1.9.1
From c7cf46b7e5af9550796e0d353d289a9e30affcb4 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 09:51:49 +0100
Subject: [PATCH 03/14] s3:wscript_build: remove allow_warnings=True from
LIBNET_DSSYNC
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source3/wscript_build | 1 -
1 file changed, 1 deletion(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 518888b..8870e9f 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -713,7 +713,6 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
source='''libnet/libnet_dssync.c
libnet/libnet_dssync_passdb.c
libnet/libnet_dssync_keytab.c''',
- allow_warnings=True,
deps='LIBNET RPC_NDR_DRSUAPI')
bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
--
1.9.1
From 317123bfcb240677385486013c9bf9fd7a94e687 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 10:01:27 +0100
Subject: [PATCH 04/14] spoolss.idl: add SPOOLSS_JOB_CONTROL_NOOP = 0
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
librpc/idl/spoolss.idl | 1 +
1 file changed, 1 insertion(+)
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index e7fecfe..5bbc267 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1067,6 +1067,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
} spoolss_JobInfoContainer;
typedef [v1_enum] enum {
+ SPOOLSS_JOB_CONTROL_NOOP = 0,
SPOOLSS_JOB_CONTROL_PAUSE = 1,
SPOOLSS_JOB_CONTROL_RESUME = 2,
SPOOLSS_JOB_CONTROL_CANCEL = 3,
--
1.9.1
From c4c82b458cd278d569db1d8b43f80b28b56519be Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 10:03:08 +0100
Subject: [PATCH 05/14] s3:rpc_server/spoolss: make use of
SPOOLSS_JOB_CONTROL_NOOP
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index a195eb6..d61b072c 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -7548,7 +7548,7 @@ WERROR _spoolss_SetJob(struct pipes_struct *p,
errcode = print_job_resume(session_info, p->msg_ctx,
snum, r->in.job_id);
break;
- case 0:
+ case SPOOLSS_JOB_CONTROL_NOOP:
errcode = WERR_OK;
break;
default:
--
1.9.1
From 9395593385eec54b67332715c75f44261edbfed7 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 10:03:41 +0100
Subject: [PATCH 06/14] s3:rpc_server/wscript_build: remove allow_warnings=True
from RPC_SPOOLSS
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source3/rpc_server/wscript_build | 1 -
1 file changed, 1 deletion(-)
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 481d39c..d0fe86d 100755
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -96,7 +96,6 @@ bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS',
source='''spoolss/srv_spoolss_nt.c
../../librpc/gen_ndr/srv_spoolss.c
spoolss/srv_spoolss_util.c''',
- allow_warnings=True,
deps='PRINTING PRINTBACKEND LIBCLI_WINREG_INTERNAL')
bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC',
--
1.9.1
From 7e5ebbf72a6f30f403b1ca123915d270dd6ffb2e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 10:15:47 +0100
Subject: [PATCH 07/14] s4:rpc_server/drsuapi: fix warnings in
dcesrv_drsuapi_DsGetDomainControllerInfo_1()
'default' is already handled in an earlier switch statement,
so this won't be reached but avoids a warning.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 879f63f..927e98b 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -773,6 +773,8 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
}
break;
+ default:
+ return WERR_UNKNOWN_LEVEL;
}
return WERR_OK;
}
--
1.9.1
From d5949cd4b6f1d5963a5668f13793c909a68a15e1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 10:15:47 +0100
Subject: [PATCH 08/14] s4:rpc_server/drsuapi: remove unused variable in
dcesrv_drsuapi_DsWriteAccountSpn()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source4/rpc_server/drsuapi/writespn.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/source4/rpc_server/drsuapi/writespn.c b/source4/rpc_server/drsuapi/writespn.c
index ccf612b..2280f88 100644
--- a/source4/rpc_server/drsuapi/writespn.c
+++ b/source4/rpc_server/drsuapi/writespn.c
@@ -147,7 +147,6 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
{
struct drsuapi_bind_state *b_state;
struct dcesrv_handle *h;
- enum security_user_level level;
*r->out.level_out = r->in.level;
@@ -157,8 +156,6 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
r->out.res = talloc(mem_ctx, union drsuapi_DsWriteAccountSpnResult);
W_ERROR_HAVE_NO_MEMORY(r->out.res);
- level = security_session_user_level(dce_call->conn->auth_state.session_info, NULL);
-
switch (r->in.level) {
case 1: {
struct drsuapi_DsWriteAccountSpnRequest1 *req;
--
1.9.1
From e0a773afed64e69944b09702607b64961a047ee8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 10:15:47 +0100
Subject: [PATCH 09/14] s4:rpc_server/drsuapi: fix const warning in
writespn_check_spn()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source4/rpc_server/drsuapi/writespn.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source4/rpc_server/drsuapi/writespn.c b/source4/rpc_server/drsuapi/writespn.c
index 2280f88..04a4792 100644
--- a/source4/rpc_server/drsuapi/writespn.c
+++ b/source4/rpc_server/drsuapi/writespn.c
@@ -57,7 +57,7 @@ static bool writespn_check_spn(struct drsuapi_bind_state *b_state,
krb5_context krb_ctx;
krb5_error_code kerr;
krb5_principal principal;
- krb5_data *component;
+ const krb5_data *component;
const char *dns_name, *dnsHostName;
/* The service principal name shouldn't be NULL */
--
1.9.1
From 8c9e1f4468c763ecfbf7d793d6d5a23f9d143445 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 10:15:47 +0100
Subject: [PATCH 10/14] s4:rpc_server/drsuapi: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source4/rpc_server/wscript_build | 1 -
1 file changed, 1 deletion(-)
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 55f45c7..6b06f8f 100755
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -130,7 +130,6 @@ bld.SAMBA_MODULE('dcerpc_spoolss',
bld.SAMBA_MODULE('dcerpc_drsuapi',
source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c',
- allow_warnings=True,
subsystem='dcerpc_server',
init_function='dcerpc_server_drsuapi_init',
deps='samdb DCERPC_COMMON NDR_DRSUAPI samba-security'
--
1.9.1
From 56873f3dcc9e8601429767a9af2f5fe09054981c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 10:23:39 +0100
Subject: [PATCH 11/14] s4:rpc_server/samr: remove unused variables
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source4/rpc_server/samr/dcesrv_samr.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index bf2174c..165b405 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -313,7 +313,6 @@ static NTSTATUS dcesrv_samr_LookupDomain(struct dcesrv_call_state *dce_call, TAL
static NTSTATUS dcesrv_samr_EnumDomains(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct samr_EnumDomains *r)
{
- struct samr_connect_state *c_state;
struct dcesrv_handle *h;
struct samr_SamArray *array;
uint32_t i, start_i;
@@ -324,8 +323,6 @@ static NTSTATUS dcesrv_samr_EnumDomains(struct dcesrv_call_state *dce_call, TALL
DCESRV_PULL_HANDLE(h, r->in.connect_handle, SAMR_HANDLE_CONNECT);
- c_state = h->data;
-
*r->out.resume_handle = 2;
start_i = *r->in.resume_handle;
@@ -1886,13 +1883,11 @@ static NTSTATUS dcesrv_samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TAL
struct dcesrv_handle *h;
struct samr_account_state *g_state;
struct ldb_message *msg;
- struct ldb_context *sam_ctx;
int ret;
DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
g_state = h->data;
- sam_ctx = g_state->sam_ctx;
msg = ldb_msg_new(mem_ctx);
if (msg == NULL) {
@@ -2338,13 +2333,11 @@ static NTSTATUS dcesrv_samr_SetAliasInfo(struct dcesrv_call_state *dce_call, TAL
struct dcesrv_handle *h;
struct samr_account_state *a_state;
struct ldb_message *msg;
- struct ldb_context *sam_ctx;
int ret;
DCESRV_PULL_HANDLE(h, r->in.alias_handle, SAMR_HANDLE_ALIAS);
a_state = h->data;
- sam_ctx = a_state->sam_ctx;
msg = ldb_msg_new(mem_ctx);
if (msg == NULL) {
--
1.9.1
From 8c0e3a02a2f444c85e34fea06b4800a9365fa24c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 16:07:03 +0100
Subject: [PATCH 12/14] s4:rpc_server/samr: handle ROLE_AUTO explicit to avoid
a compiler warning
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source4/rpc_server/samr/dcesrv_samr.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 165b405..24fe2d1 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -496,6 +496,7 @@ static NTSTATUS dcesrv_samr_info_DomGeneralInformation(struct samr_domain_state
break;
case ROLE_DOMAIN_PDC:
case ROLE_DOMAIN_BDC:
+ case ROLE_AUTO:
return NT_STATUS_INTERNAL_ERROR;
case ROLE_DOMAIN_MEMBER:
info->role = SAMR_ROLE_DOMAIN_MEMBER;
--
1.9.1
From e6878c7712f1b13fc837704b284ac9511426f3d9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 16:07:43 +0100
Subject: [PATCH 13/14] s4:rpc_server/samr: use the same logic in
*info_DomInfo7() as in info_DomGeneralInformation()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source4/rpc_server/samr/dcesrv_samr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 24fe2d1..d0c748e 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -602,8 +602,9 @@ static NTSTATUS dcesrv_samr_info_DomInfo7(struct samr_domain_state *state,
}
break;
case ROLE_DOMAIN_PDC:
- info->role = SAMR_ROLE_DOMAIN_PDC;
- break;
+ case ROLE_DOMAIN_BDC:
+ case ROLE_AUTO:
+ return NT_STATUS_INTERNAL_ERROR;
case ROLE_DOMAIN_MEMBER:
info->role = SAMR_ROLE_DOMAIN_MEMBER;
break;
--
1.9.1
From 14fab0a639465bd2f8ecdec6cb66e00c32645907 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 18 Mar 2015 16:12:11 +0100
Subject: [PATCH 14/14] s4:rpc_server/same: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
source4/rpc_server/wscript_build | 1 -
1 file changed, 1 deletion(-)
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 6b06f8f..f7110e1 100755
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -76,7 +76,6 @@ bld.SAMBA_MODULE('dcerpc_unixinfo',
bld.SAMBA_MODULE('dcesrv_samr',
source='samr/dcesrv_samr.c samr/samr_password.c',
- allow_warnings=True,
autoproto='samr/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_samr_init',
--
1.9.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150318/2848d595/attachment.pgp>
More information about the samba-technical
mailing list