[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Sat Jun 26 12:22:03 MDT 2010
The branch, master has been updated
via 6f6365d... s4:rpc_server/srvsvc/dcesrv_srvsvc.c - remove unreachable code
via f12dab8... s4:rpc_server/wkssvc/dcesrv_wkssvc.c - remove unreachable code
via 3c3ecf4... s4:rpc_server/lsa/dcesrv_lsa.c - remove unreachable code
via d85d605... s4:lsa/lsa_lookup.c - use a better type for the "rtype" of the wellknown SIDs
via 3f2e9ce... s4:rpc_server/drsuapi/drsutil.c - remove unreachable code
via e5e4184... s4:rpc_server/dcesrv_auth.c - remove unreachable code
via 75d6842... s4:winbind/wb_samba3_protocol.c - add cast to suppress warnings on Solaris 10 cc
via 0c29224... s4:kdc/kdc.c - add cast to suppress warnings on Solaris 10 cc
via c8a5ed8... s4:kdc/kpasswdd.c - remove unreachable code
from c7b52b2... s4:provision.py - fix comment regarding DNS entries
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6f6365daba99c03788fc33a226467964825578db
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:58:45 2010 +0200
s4:rpc_server/srvsvc/dcesrv_srvsvc.c - remove unreachable code
commit f12dab8e00026a381296b6f5fbf5bac98af49627
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:58:45 2010 +0200
s4:rpc_server/wkssvc/dcesrv_wkssvc.c - remove unreachable code
commit 3c3ecf40e5bb0f81b8c0aa094384d7c3ee0e48bd
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:58:45 2010 +0200
s4:rpc_server/lsa/dcesrv_lsa.c - remove unreachable code
commit d85d6054c98b4c164075e19175ac64e1b6f9acab
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:55:07 2010 +0200
s4:lsa/lsa_lookup.c - use a better type for the "rtype" of the wellknown SIDs
To suppress warnings on Solaris 10
commit 3f2e9ce2b40f67de8ef8488551b72f90fbc06315
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:45:45 2010 +0200
s4:rpc_server/drsuapi/drsutil.c - remove unreachable code
commit e5e4184e5a599c07e3814a3e7913a5caadd8c5f6
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:45:45 2010 +0200
s4:rpc_server/dcesrv_auth.c - remove unreachable code
commit 75d6842c4087cd9f204b8beafaa88f1fac7cf999
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:43:51 2010 +0200
s4:winbind/wb_samba3_protocol.c - add cast to suppress warnings on Solaris 10 cc
commit 0c29224da36e06aa5b395496ca1050be3f4e8df2
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:43:51 2010 +0200
s4:kdc/kdc.c - add cast to suppress warnings on Solaris 10 cc
commit c8a5ed8db9a765434db3d5e6037f4acfa33fd0e6
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jun 26 19:42:29 2010 +0200
s4:kdc/kpasswdd.c - remove unreachable code
-----------------------------------------------------------------------
Summary of changes:
source4/kdc/kdc.c | 4 +-
source4/kdc/kpasswdd.c | 2 -
source4/rpc_server/dcesrv_auth.c | 2 -
source4/rpc_server/drsuapi/drsutil.c | 1 -
source4/rpc_server/lsa/dcesrv_lsa.c | 2 -
source4/rpc_server/lsa/lsa_lookup.c | 7 +++--
source4/rpc_server/srvsvc/dcesrv_srvsvc.c | 36 -----------------------------
source4/rpc_server/wkssvc/dcesrv_wkssvc.c | 4 ---
source4/winbind/wb_samba3_protocol.c | 2 +-
9 files changed, 7 insertions(+), 53 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index b824bb8..e16e20b 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -219,10 +219,10 @@ static void kdc_tcp_call_loop(struct tevent_req *subreq)
/* First add the length of the out buffer */
RSIVAL(call->out_hdr, 0, call->out.length);
- call->out_iov[0].iov_base = call->out_hdr;
+ call->out_iov[0].iov_base = (char *) call->out_hdr;
call->out_iov[0].iov_len = 4;
- call->out_iov[1].iov_base = call->out.data;
+ call->out_iov[1].iov_base = (char *) call->out.data;
call->out_iov[1].iov_len = call->out.length;
subreq = tstream_writev_queue_send(call,
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index a0ff28a..fb6723c 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -233,7 +233,6 @@ static bool kpasswd_process_request(struct kdc_server *kdc,
return kpasswdd_change_password(kdc, mem_ctx, session_info,
&password, reply);
- break;
}
case KRB5_KPASSWD_VERS_SETPW:
{
@@ -407,7 +406,6 @@ static bool kpasswd_process_request(struct kdc_server *kdc,
version),
reply);
}
- return true;
}
bool kpasswdd_process(struct kdc_server *kdc,
diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
index 4915c3c..50d6f59 100644
--- a/source4/rpc_server/dcesrv_auth.c
+++ b/source4/rpc_server/dcesrv_auth.c
@@ -185,8 +185,6 @@ bool dcesrv_auth_auth3(struct dcesrv_call_state *call)
nt_errstr(status)));
return false;
}
-
- return true;
}
/*
diff --git a/source4/rpc_server/drsuapi/drsutil.c b/source4/rpc_server/drsuapi/drsutil.c
index 11eff25..c00653f 100644
--- a/source4/rpc_server/drsuapi/drsutil.c
+++ b/source4/rpc_server/drsuapi/drsutil.c
@@ -153,5 +153,4 @@ void drsuapi_process_secret_attribute(struct drsuapi_DsReplicaAttribute *attr,
default:
return;
}
- return;
}
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 2483d68..57c73e4 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -477,8 +477,6 @@ static WERROR dcesrv_dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_cal
default:
return WERR_INVALID_PARAM;
}
-
- return WERR_INVALID_PARAM;
}
/*
diff --git a/source4/rpc_server/lsa/lsa_lookup.c b/source4/rpc_server/lsa/lsa_lookup.c
index 7452c73..11a6750 100644
--- a/source4/rpc_server/lsa/lsa_lookup.c
+++ b/source4/rpc_server/lsa/lsa_lookup.c
@@ -26,7 +26,7 @@ static const struct {
const char *domain;
const char *name;
const char *sid;
- int rtype;
+ enum lsa_SidType rtype;
} well_known[] = {
{
.name = "EVERYONE",
@@ -219,7 +219,7 @@ static NTSTATUS lookup_well_known_names(TALLOC_CTX *mem_ctx, const char *domain,
static NTSTATUS lookup_well_known_sids(TALLOC_CTX *mem_ctx,
const char *sid_str, const char **authority_name,
- const char **name, uint32_t *rtype)
+ const char **name, enum lsa_SidType *rtype)
{
unsigned int i;
for (i=0; well_known[i].sid; i++) {
@@ -939,7 +939,8 @@ NTSTATUS dcesrv_lsa_LookupNames2(struct dcesrv_call_state *dce_call,
const char *name = r->in.names[i].string;
const char *authority_name;
struct dom_sid *sid;
- uint32_t rtype, sid_index, rid=0;
+ uint32_t sid_index, rid=0;
+ enum lsa_SidType rtype;
NTSTATUS status2;
r->out.sids->count++;
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index c8d276d..f86a500 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -68,8 +68,6 @@ static WERROR dcesrv_srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, T
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_OK;
}
@@ -93,8 +91,6 @@ static WERROR dcesrv_srvsvc_NetCharDevGetInfo(struct dcesrv_call_state *dce_call
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -140,8 +136,6 @@ static WERROR dcesrv_srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call,
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -165,8 +159,6 @@ static WERROR dcesrv_srvsvc_NetCharDevQGetInfo(struct dcesrv_call_state *dce_cal
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -194,8 +186,6 @@ static WERROR dcesrv_srvsvc_NetCharDevQSetInfo(struct dcesrv_call_state *dce_cal
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -251,8 +241,6 @@ static WERROR dcesrv_srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALL
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -288,8 +276,6 @@ static WERROR dcesrv_srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALL
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -313,8 +299,6 @@ static WERROR dcesrv_srvsvc_NetFileGetInfo(struct dcesrv_call_state *dce_call, T
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -390,8 +374,6 @@ static WERROR dcesrv_srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALL
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -618,8 +600,6 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
@@ -699,8 +679,6 @@ static WERROR dcesrv_srvsvc_fiel_ShareInfo(struct dcesrv_call_state *dce_call, T
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
/*
@@ -949,8 +927,6 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -1087,8 +1063,6 @@ static WERROR dcesrv_srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call,
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
@@ -1527,8 +1501,6 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -1575,8 +1547,6 @@ static WERROR dcesrv_srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALL
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -1656,8 +1626,6 @@ static WERROR dcesrv_srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call,
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
/*
@@ -1786,8 +1754,6 @@ static WERROR dcesrv_srvsvc_NetNameValidate(struct dcesrv_call_state *dce_call,
default:
return WERR_INVALID_PARAM;
}
-
- return WERR_INVALID_PARAM;
}
@@ -2045,8 +2011,6 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
index 0be956d..f680ee8 100644
--- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
+++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
@@ -83,8 +83,6 @@ static WERROR dcesrv_wkssvc_NetWkstaGetInfo(struct dcesrv_call_state *dce_call,
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
@@ -147,8 +145,6 @@ static WERROR dcesrv_wkssvc_NetWkstaTransportEnum(struct dcesrv_call_state *dce_
default:
return WERR_UNKNOWN_LEVEL;
}
-
- return WERR_UNKNOWN_LEVEL;
}
diff --git a/source4/winbind/wb_samba3_protocol.c b/source4/winbind/wb_samba3_protocol.c
index 8d0127b..8dbb0c8 100644
--- a/source4/winbind/wb_samba3_protocol.c
+++ b/source4/winbind/wb_samba3_protocol.c
@@ -263,7 +263,7 @@ NTSTATUS wbsrv_samba3_send_reply(struct wbsrv_samba3_call *call)
status = wbsrv_samba3_push_reply(call);
NT_STATUS_NOT_OK_RETURN(status);
- call->out_iov[0].iov_base = call->out.data;
+ call->out_iov[0].iov_base = (char *) call->out.data;
call->out_iov[0].iov_len = call->out.length;
subreq = tstream_writev_queue_send(call,
--
Samba Shared Repository
More information about the samba-cvs
mailing list