[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Wed Feb 2 07:51:54 MST 2011
The branch, v3-6-test has been updated
via 1f1cbf3 s3: Remove superfluous ;
via 9d9d376 nsswitch: remove unused code from wbinfo.c
from c97e23f s3: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 1f1cbf3b1133cfa08f8fc91b42f583ee01e75817
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 2 12:50:42 2011 +0100
s3: Remove superfluous ;
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Feb 2 15:44:21 CET 2011 on sn-devel-104
(cherry picked from commit 50be0b2c1e7e0573245e21df886ab491a0738226)
commit 9d9d376b6ad8cba19db59666c8c041e0a3953976
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 2 12:43:59 2011 +0100
nsswitch: remove unused code from wbinfo.c
Guenther
(cherry picked from commit 3bdd2efff8d11448275965b464ac194a2ee0d3ae)
-----------------------------------------------------------------------
Summary of changes:
nsswitch/wbinfo.c | 27 ---------------------------
source3/lib/ctdbd_conn.c | 2 +-
source3/lib/secdesc.c | 8 ++++----
source3/modules/vfs_acl_common.c | 4 ++--
source3/modules/vfs_xattr_tdb.c | 4 ++--
source3/nmbd/nmbd_winsserver.c | 2 +-
source3/registry/regfio.c | 2 +-
source3/rpc_client/cli_pipe_schannel.c | 2 +-
source3/rpc_server/srv_samr_nt.c | 2 +-
source3/rpc_server/srv_spoolss_nt.c | 2 +-
source3/rpc_server/srv_spoolss_util.c | 2 +-
source3/rpc_server/srv_srvsvc_nt.c | 2 +-
source3/rpcclient/cmd_spoolss.c | 2 +-
source3/winbindd/winbindd_lookupsid.c | 2 +-
14 files changed, 18 insertions(+), 45 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index a4b2a3c..1056fb3 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -139,31 +139,6 @@ static bool parse_wbinfo_domain_user(const char *domuser, fstring domain,
return true;
}
-/* Parse string of "uid,sid" or "gid,sid" into separate int and string values.
- * Return true if input was valid, false otherwise. */
-static bool parse_mapping_arg(char *arg, int *id, char **sid)
-{
- char *tmp, *endptr;
-
- if (!arg || !*arg)
- return false;
-
- tmp = strtok(arg, ",");
- *sid = strtok(NULL, ",");
-
- if (!tmp || !*tmp || !*sid || !**sid)
- return false;
-
- /* Because atoi() can return 0 on invalid input, which would be a valid
- * UID/GID we must use strtoul() and do error checking */
- *id = strtoul(tmp, &endptr, 10);
-
- if (endptr[0] != '\0')
- return false;
-
- return true;
-}
-
/* pull pwent info for a given user */
static bool wbinfo_get_userinfo(char *user)
@@ -1862,10 +1837,8 @@ int main(int argc, char **argv, char **envp)
TALLOC_CTX *frame = talloc_stackframe();
poptContext pc;
static char *string_arg;
- char *string_subarg = NULL;
static char *opt_domain_name;
static int int_arg;
- int int_subarg = -1;
int result = 1;
bool verbose = false;
bool use_ntlmv2 = false;
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index d201693..bad5285 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -155,7 +155,7 @@ static bool ctdbd_working(struct ctdbd_connection *conn, uint32_t vnn)
ret = true;
fail:
TALLOC_FREE(outdata.dptr);
- return ret;;
+ return ret;
}
uint32 ctdbd_vnn(const struct ctdbd_connection *conn)
diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index 9ceba10..001eccb 100644
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -266,7 +266,7 @@ NTSTATUS marshall_sec_desc(TALLOC_CTX *mem_ctx,
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
DEBUG(0, ("ndr_push_security_descriptor failed: %s\n",
ndr_errstr(ndr_err)));
- return ndr_map_error2ntstatus(ndr_err);;
+ return ndr_map_error2ntstatus(ndr_err);
}
*data = blob.data;
@@ -292,7 +292,7 @@ NTSTATUS marshall_sec_desc_buf(TALLOC_CTX *mem_ctx,
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
DEBUG(0, ("ndr_push_sec_desc_buf failed: %s\n",
ndr_errstr(ndr_err)));
- return ndr_map_error2ntstatus(ndr_err);;
+ return ndr_map_error2ntstatus(ndr_err);
}
*data = blob.data;
@@ -328,7 +328,7 @@ NTSTATUS unmarshall_sec_desc(TALLOC_CTX *mem_ctx, uint8 *data, size_t len,
DEBUG(0, ("ndr_pull_security_descriptor failed: %s\n",
ndr_errstr(ndr_err)));
TALLOC_FREE(result);
- return ndr_map_error2ntstatus(ndr_err);;
+ return ndr_map_error2ntstatus(ndr_err);
}
*psecdesc = result;
@@ -364,7 +364,7 @@ NTSTATUS unmarshall_sec_desc_buf(TALLOC_CTX *mem_ctx, uint8_t *data, size_t len,
DEBUG(0, ("ndr_pull_sec_desc_buf failed: %s\n",
ndr_errstr(ndr_err)));
TALLOC_FREE(result);
- return ndr_map_error2ntstatus(ndr_err);;
+ return ndr_map_error2ntstatus(ndr_err);
}
*psecdesc_buf = result;
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 3296ddc..c89ca7a 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -86,7 +86,7 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
DEBUG(5, ("parse_acl_blob: ndr_pull_xattr_NTACL failed: %s\n",
ndr_errstr(ndr_err)));
- return ndr_map_error2ntstatus(ndr_err);;
+ return ndr_map_error2ntstatus(ndr_err);
}
switch (xacl.version) {
@@ -153,7 +153,7 @@ static NTSTATUS create_acl_blob(const struct security_descriptor *psd,
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
DEBUG(5, ("create_acl_blob: ndr_push_xattr_NTACL failed: %s\n",
ndr_errstr(ndr_err)));
- return ndr_map_error2ntstatus(ndr_err);;
+ return ndr_map_error2ntstatus(ndr_err);
}
return NT_STATUS_OK;
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index 435b39a..594f2e6 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -56,7 +56,7 @@ static NTSTATUS xattr_tdb_pull_attrs(TALLOC_CTX *mem_ctx,
DEBUG(0, ("ndr_pull_tdb_xattrs failed: %s\n",
ndr_errstr(ndr_err)));
TALLOC_FREE(result);
- return ndr_map_error2ntstatus(ndr_err);;
+ return ndr_map_error2ntstatus(ndr_err);
}
*presult = result;
@@ -80,7 +80,7 @@ static NTSTATUS xattr_tdb_push_attrs(TALLOC_CTX *mem_ctx,
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
DEBUG(0, ("ndr_push_tdb_xattrs failed: %s\n",
ndr_errstr(ndr_err)));
- return ndr_map_error2ntstatus(ndr_err);;
+ return ndr_map_error2ntstatus(ndr_err);
}
*data = make_tdb_data(blob.data, blob.length);
diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index d4580e4..2f48bc7 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -2138,7 +2138,7 @@ void wins_process_name_release_request(struct subnet_record *subrec,
uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
struct name_record *namerec = NULL;
struct in_addr from_ip;
- bool releasing_group_name = (nb_flags & NB_GROUP) ? True : False;;
+ bool releasing_group_name = (nb_flags & NB_GROUP) ? True : False;
putip((char *)&from_ip,&nmb->additional->rdata[2]);
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 7ab262d..e300b14 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -1478,7 +1478,7 @@ static REGF_HBIN* regf_hbin_allocate( REGF_FILE *file, uint32 block_size )
hbin->file_off = sbuf.st_ex_size;
hbin->free_off = HBIN_HEADER_REC_SIZE;
- hbin->free_size = block_size - hbin->free_off + sizeof(uint32);;
+ hbin->free_size = block_size - hbin->free_off + sizeof(uint32);
hbin->block_size = block_size;
hbin->first_hbin_off = hbin->file_off - REGF_BLOCKSIZE;
diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c
index 7bc8d80..2c605c6 100644
--- a/source3/rpc_client/cli_pipe_schannel.c
+++ b/source3/rpc_client/cli_pipe_schannel.c
@@ -76,7 +76,7 @@ static NTSTATUS get_schannel_session_key_common(struct rpc_pipe_client *netlogon
return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
- return NT_STATUS_OK;;
+ return NT_STATUS_OK;
}
/****************************************************************************
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 116d529..5087ec3 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1491,7 +1491,7 @@ NTSTATUS _samr_QueryDisplayInfo(struct pipes_struct *p,
temp_size=max_entries*struct_size;
if (temp_size > r->in.buf_size) {
- max_entries = MIN((r->in.buf_size / struct_size),max_entries);;
+ max_entries = MIN((r->in.buf_size / struct_size),max_entries);
DEBUG(5, ("_samr_QueryDisplayInfo: buffer size limits to "
"only %d entries\n", max_entries));
}
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index defffb6..a06e643 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4798,7 +4798,7 @@ static WERROR string_array_from_driver_info(TALLOC_CTX *mem_ctx,
const char **array = NULL;
if (string_array == NULL) {
- return WERR_INVALID_PARAMETER;;
+ return WERR_INVALID_PARAMETER;
}
for (i=0; string_array[i] && string_array[i][0] != '\0'; i++) {
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index 79549ac..70601c8 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -461,7 +461,7 @@ static WERROR winreg_printer_enumvalues(TALLOC_CTX *mem_ctx,
uint8_t *data;
uint32_t data_size;
uint32_t length;
- char n = '\0';;
+ char n = '\0';
name_buf.name = &n;
name_buf.size = max_valnamelen + 2;
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 82b8939..fe325d2 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -387,7 +387,7 @@ static void init_srv_share_info_502(struct pipes_struct *p,
struct sec_desc_buf *sd_buf = NULL;
size_t sd_size = 0;
TALLOC_CTX *ctx = p->mem_ctx;
- char *remark = talloc_strdup(ctx, lp_comment(snum));;
+ char *remark = talloc_strdup(ctx, lp_comment(snum));
if (remark) {
remark = talloc_sub_advanced(
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 248996e..25a1ff6 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -1890,7 +1890,7 @@ static WERROR cmd_spoolss_setdriver(struct rpc_pipe_client *cli,
}
if (!W_ERROR_IS_OK(result)) {
printf("SetPrinter call failed!\n");
- goto done;;
+ goto done;
}
printf("Successfully set %s to driver %s.\n", argv[1], argv[2]);
diff --git a/source3/winbindd/winbindd_lookupsid.c b/source3/winbindd/winbindd_lookupsid.c
index 596699f..f38dc71 100644
--- a/source3/winbindd/winbindd_lookupsid.c
+++ b/source3/winbindd/winbindd_lookupsid.c
@@ -54,7 +54,7 @@ struct tevent_req *winbindd_lookupsid_send(TALLOC_CTX *mem_ctx,
if (!string_to_sid(&state->sid, request->data.sid)) {
DEBUG(5, ("%s not a SID\n", request->data.sid));
tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
- return tevent_req_post(req, ev);;
+ return tevent_req_post(req, ev);
}
subreq = wb_lookupsid_send(state, ev, &state->sid);
--
Samba Shared Repository
More information about the samba-cvs
mailing list