svn commit: samba r9781 - in branches/tmp/RPCREWRITE/source: lib
libads nsswitch param rpc_parse rpc_server utils
jra at samba.org
jra at samba.org
Tue Aug 30 06:44:47 GMT 2005
Author: jra
Date: 2005-08-30 06:44:45 +0000 (Tue, 30 Aug 2005)
New Revision: 9781
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9781
Log:
Keeping up to date with the Peach's whilst I wrestle this monster
to the ground....
Jeremy.
Modified:
branches/tmp/RPCREWRITE/source/lib/util_unistr.c
branches/tmp/RPCREWRITE/source/libads/krb5_setpw.c
branches/tmp/RPCREWRITE/source/nsswitch/wb_common.c
branches/tmp/RPCREWRITE/source/nsswitch/winbindd_util.c
branches/tmp/RPCREWRITE/source/param/loadparm.c
branches/tmp/RPCREWRITE/source/rpc_parse/parse_lsa.c
branches/tmp/RPCREWRITE/source/rpc_server/srv_reg_nt.c
branches/tmp/RPCREWRITE/source/rpc_server/srv_srvsvc_nt.c
branches/tmp/RPCREWRITE/source/utils/profiles.c
Changeset:
Modified: branches/tmp/RPCREWRITE/source/lib/util_unistr.c
===================================================================
--- branches/tmp/RPCREWRITE/source/lib/util_unistr.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/lib/util_unistr.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -213,8 +213,9 @@
size_t dos_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate)
{
- return push_ucs2(NULL, dst, src, len,
- STR_UNICODE|STR_NOALIGN | (null_terminate?STR_TERMINATE:0));
+ int flags = null_terminate ? STR_UNICODE|STR_NOALIGN|STR_TERMINATE
+ : STR_UNICODE|STR_NOALIGN;
+ return push_ucs2(NULL, dst, src, len, flags);
}
Modified: branches/tmp/RPCREWRITE/source/libads/krb5_setpw.c
===================================================================
--- branches/tmp/RPCREWRITE/source/libads/krb5_setpw.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/libads/krb5_setpw.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -317,23 +317,17 @@
switch(res_code) {
case KRB5_KPASSWD_ACCESSDENIED:
return KRB5KDC_ERR_BADOPTION;
- break;
case KRB5_KPASSWD_INITIAL_FLAG_NEEDED:
return KRB5KDC_ERR_BADOPTION;
/* return KV5M_ALT_METHOD; MIT-only define */
- break;
case KRB5_KPASSWD_ETYPE_NOSUPP:
return KRB5KDC_ERR_ETYPE_NOSUPP;
- break;
case KRB5_KPASSWD_BAD_PRINCIPAL:
return KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN;
- break;
case KRB5_KPASSWD_POLICY_REJECT:
return KRB5KDC_ERR_POLICY;
- break;
default:
return KRB5KRB_ERR_GENERIC;
- break;
}
}
}
Modified: branches/tmp/RPCREWRITE/source/nsswitch/wb_common.c
===================================================================
--- branches/tmp/RPCREWRITE/source/nsswitch/wb_common.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/nsswitch/wb_common.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -280,14 +280,6 @@
close(fd);
return -1;
-
- if (connect(fd, (struct sockaddr *)&sunaddr,
- sizeof(sunaddr)) == -1) {
- close(fd);
- return -1;
- }
-
- return fd;
}
/* Connect to winbindd socket */
Modified: branches/tmp/RPCREWRITE/source/nsswitch/winbindd_util.c
===================================================================
--- branches/tmp/RPCREWRITE/source/nsswitch/winbindd_util.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/nsswitch/winbindd_util.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -98,7 +98,7 @@
{
struct winbindd_domain *domain;
const char *alternative_name = NULL;
- static const DOM_SID null_sid;
+ static const DOM_SID null_sid = {0};
/* ignore alt_name if we are not in an AD domain */
Modified: branches/tmp/RPCREWRITE/source/param/loadparm.c
===================================================================
--- branches/tmp/RPCREWRITE/source/param/loadparm.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/param/loadparm.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -2019,9 +2019,9 @@
FN_LOCAL_INTEGER(lp_csc_policy, iCSCPolicy)
FN_LOCAL_INTEGER(lp_write_cache_size, iWriteCacheSize)
FN_LOCAL_INTEGER(lp_block_size, iBlock_size)
-FN_LOCAL_INTEGER(lp_allocation_roundup_size, iallocation_roundup_size);
-FN_LOCAL_INTEGER(lp_aio_read_size, iAioReadSize);
-FN_LOCAL_INTEGER(lp_aio_write_size, iAioWriteSize);
+FN_LOCAL_INTEGER(lp_allocation_roundup_size, iallocation_roundup_size)
+FN_LOCAL_INTEGER(lp_aio_read_size, iAioReadSize)
+FN_LOCAL_INTEGER(lp_aio_write_size, iAioWriteSize)
FN_LOCAL_CHAR(lp_magicchar, magic_char)
FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
FN_GLOBAL_INTEGER(lp_winbind_max_idle_children, &Globals.winbind_max_idle_children)
Modified: branches/tmp/RPCREWRITE/source/rpc_parse/parse_lsa.c
===================================================================
--- branches/tmp/RPCREWRITE/source/rpc_parse/parse_lsa.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/rpc_parse/parse_lsa.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -3036,7 +3036,6 @@
default:
DEBUG(0,("unsupported info-level: %d\n", info->info_class));
return False;
- break;
}
return True;
Modified: branches/tmp/RPCREWRITE/source/rpc_server/srv_reg_nt.c
===================================================================
--- branches/tmp/RPCREWRITE/source/rpc_server/srv_reg_nt.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/rpc_server/srv_reg_nt.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -1177,8 +1177,6 @@
DEBUG(2,("_reg_save_key: Saving [%s] to %s in share %s\n", regkey->name, filename, lp_servicename(snum) ));
return backup_registry_key( regkey, filename );
-
- return WERR_OK;
}
/*******************************************************************
Modified: branches/tmp/RPCREWRITE/source/rpc_server/srv_srvsvc_nt.c
===================================================================
--- branches/tmp/RPCREWRITE/source/rpc_server/srv_srvsvc_nt.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/rpc_server/srv_srvsvc_nt.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -1597,11 +1597,9 @@
DEBUG(3, ("_srv_net_share_set_info: client is trying to change csc policy from the network; must be done with smb.conf\n"));
return WERR_ACCESS_DENIED;
}
- break;
case 1006:
case 1007:
return WERR_ACCESS_DENIED;
- break;
case 1501:
pstrcpy(pathname, lp_pathname(snum));
fstrcpy(comment, lp_comment(snum));
@@ -1753,7 +1751,6 @@
case 1006:
case 1007:
return WERR_ACCESS_DENIED;
- break;
case 1501:
/* DFS only level. */
return WERR_ACCESS_DENIED;
Modified: branches/tmp/RPCREWRITE/source/utils/profiles.c
===================================================================
--- branches/tmp/RPCREWRITE/source/utils/profiles.c 2005-08-30 06:41:32 UTC (rev 9780)
+++ branches/tmp/RPCREWRITE/source/utils/profiles.c 2005-08-30 06:44:45 UTC (rev 9781)
@@ -188,7 +188,7 @@
exit(1);
}
- if ((!change & new_val) || (change & !new_val)) {
+ if ((!change && new_val) || (change && !new_val)) {
fprintf(stderr, "You must specify both -c and -n if one or the other is set!\n");
poptPrintUsage(pc, stderr, 0);
exit(252);
@@ -225,5 +225,5 @@
poptFreeContext(pc);
- exit( 0 );
+ return( 0 );
}
More information about the samba-cvs
mailing list