Author: vlendec Date: 2005-08-30 07:03:41 +0000 (Tue, 30 Aug 2005) New Revision: 9784
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9784 Log: Merge trunk up to r9783 Modified: branches/tmp/vl-cluster/source/lib/util_unistr.c branches/tmp/vl-cluster/source/libads/krb5_setpw.c branches/tmp/vl-cluster/source/nsswitch/wb_common.c branches/tmp/vl-cluster/source/nsswitch/winbindd_user.c branches/tmp/vl-cluster/source/nsswitch/winbindd_util.c branches/tmp/vl-cluster/source/param/loadparm.c branches/tmp/vl-cluster/source/rpc_parse/parse_lsa.c branches/tmp/vl-cluster/source/rpc_server/srv_reg_nt.c branches/tmp/vl-cluster/source/rpc_server/srv_spoolss_nt.c branches/tmp/vl-cluster/source/rpc_server/srv_srvsvc_nt.c branches/tmp/vl-cluster/source/utils/profiles.c Changeset: Modified: branches/tmp/vl-cluster/source/lib/util_unistr.c =================================================================== --- branches/tmp/vl-cluster/source/lib/util_unistr.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/lib/util_unistr.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -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/vl-cluster/source/libads/krb5_setpw.c =================================================================== --- branches/tmp/vl-cluster/source/libads/krb5_setpw.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/libads/krb5_setpw.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -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/vl-cluster/source/nsswitch/wb_common.c =================================================================== --- branches/tmp/vl-cluster/source/nsswitch/wb_common.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/nsswitch/wb_common.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -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/vl-cluster/source/nsswitch/winbindd_user.c =================================================================== --- branches/tmp/vl-cluster/source/nsswitch/winbindd_user.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/nsswitch/winbindd_user.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -230,6 +230,7 @@ const char *shell, uint32 group_rid) { + fstring username; struct getpwsid_state *s = talloc_get_type_abort(private_data, struct getpwsid_state); @@ -240,7 +241,9 @@ return; } - s->username = talloc_strdup(s->state->mem_ctx, acct_name); + fstrcpy( username, acct_name ); + strlower_m( username ); + s->username = talloc_strdup(s->state->mem_ctx, username); s->fullname = talloc_strdup(s->state->mem_ctx, full_name); s->homedir = talloc_strdup(s->state->mem_ctx, homedir); s->shell = talloc_strdup(s->state->mem_ctx, shell); Modified: branches/tmp/vl-cluster/source/nsswitch/winbindd_util.c =================================================================== --- branches/tmp/vl-cluster/source/nsswitch/winbindd_util.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/nsswitch/winbindd_util.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -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/vl-cluster/source/param/loadparm.c =================================================================== --- branches/tmp/vl-cluster/source/param/loadparm.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/param/loadparm.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -2023,9 +2023,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/vl-cluster/source/rpc_parse/parse_lsa.c =================================================================== --- branches/tmp/vl-cluster/source/rpc_parse/parse_lsa.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/rpc_parse/parse_lsa.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -3036,7 +3036,6 @@ default: DEBUG(0,("unsupported info-level: %d\n", info->info_class)); return False; - break; } return True; Modified: branches/tmp/vl-cluster/source/rpc_server/srv_reg_nt.c =================================================================== --- branches/tmp/vl-cluster/source/rpc_server/srv_reg_nt.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/rpc_server/srv_reg_nt.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -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/vl-cluster/source/rpc_server/srv_spoolss_nt.c =================================================================== --- branches/tmp/vl-cluster/source/rpc_server/srv_spoolss_nt.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/rpc_server/srv_spoolss_nt.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -4175,7 +4175,11 @@ if ( ntprinter->info_2->secdesc_buf && ntprinter->info_2->secdesc_buf->len != 0 ) { - printer->secdesc = dup_sec_desc( get_talloc_ctx(), ntprinter->info_2->secdesc_buf->sec ); + /* don't use talloc_steal() here unless you do a deep steal of all + the SEC_DESC members */ + + printer->secdesc = dup_sec_desc( get_talloc_ctx(), + ntprinter->info_2->secdesc_buf->sec ); } free_a_printer(&ntprinter, 2); @@ -4209,7 +4213,11 @@ printer->flags = 0x4; if (ntprinter->info_2->secdesc_buf && ntprinter->info_2->secdesc_buf->len != 0) { - printer->secdesc = dup_sec_desc( get_talloc_ctx(), ntprinter->info_2->secdesc_buf->sec ); + /* don't use talloc_steal() here unless you do a deep steal of all + the SEC_DESC members */ + + printer->secdesc = dup_sec_desc( get_talloc_ctx(), + ntprinter->info_2->secdesc_buf->sec ); } free_a_printer(&ntprinter, 2); Modified: branches/tmp/vl-cluster/source/rpc_server/srv_srvsvc_nt.c =================================================================== --- branches/tmp/vl-cluster/source/rpc_server/srv_srvsvc_nt.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/rpc_server/srv_srvsvc_nt.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -1598,11 +1598,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)); @@ -1754,7 +1752,6 @@ case 1006: case 1007: return WERR_ACCESS_DENIED; - break; case 1501: /* DFS only level. */ return WERR_ACCESS_DENIED; Modified: branches/tmp/vl-cluster/source/utils/profiles.c =================================================================== --- branches/tmp/vl-cluster/source/utils/profiles.c 2005-08-30 06:45:53 UTC (rev 9783) +++ branches/tmp/vl-cluster/source/utils/profiles.c 2005-08-30 07:03:41 UTC (rev 9784) @@ -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 ); }
