Author: gd Date: 2007-07-02 09:46:18 +0000 (Mon, 02 Jul 2007) New Revision: 23672
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23672 Log: Allow msrpc_name_to_sid() to be called without a domain_name and just a name. Guenther Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_rpc.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c 2007-07-01 19:40:04 UTC (rev 23671) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c 2007-07-02 09:46:18 UTC (rev 23672) @@ -269,18 +269,20 @@ struct rpc_pipe_client *cli; POLICY_HND lsa_policy; - if(name == NULL || *name=='\0') { - DEBUG(3,("rpc: name_to_sid name=%s\n", domain_name)); - full_name = talloc_asprintf(mem_ctx, "%s", domain_name); - } else { - DEBUG(3,("rpc: name_to_sid name=%s\\%s\n", domain_name, name)); - full_name = talloc_asprintf(mem_ctx, "%s\\%s", domain_name, name); - } + if (name == NULL || *name=='\0') { + full_name = talloc_asprintf(mem_ctx, "%s", domain_name); + } else if (domain_name == NULL || *domain_name == '\0') { + full_name = talloc_asprintf(mem_ctx, "%s", name); + } else { + full_name = talloc_asprintf(mem_ctx, "%s\\%s", domain_name, name); + } if (!full_name) { DEBUG(0, ("talloc_asprintf failed!\n")); return NT_STATUS_NO_MEMORY; } + DEBUG(3,("rpc: name_to_sid name=%s\n", full_name)); + ws_name_return( full_name, WB_REPLACE_CHAR ); DEBUG(3,("name_to_sid [rpc] %s for domain %s\n", full_name?full_name:"", domain_name )); Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_rpc.c =================================================================== --- branches/SAMBA_3_0_26/source/nsswitch/winbindd_rpc.c 2007-07-01 19:40:04 UTC (rev 23671) +++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_rpc.c 2007-07-02 09:46:18 UTC (rev 23672) @@ -269,18 +269,20 @@ struct rpc_pipe_client *cli; POLICY_HND lsa_policy; - if(name == NULL || *name=='\0') { - DEBUG(3,("rpc: name_to_sid name=%s\n", domain_name)); - full_name = talloc_asprintf(mem_ctx, "%s", domain_name); - } else { - DEBUG(3,("rpc: name_to_sid name=%s\\%s\n", domain_name, name)); - full_name = talloc_asprintf(mem_ctx, "%s\\%s", domain_name, name); - } + if (name == NULL || *name=='\0') { + full_name = talloc_asprintf(mem_ctx, "%s", domain_name); + } else if (domain_name == NULL || *domain_name == '\0') { + full_name = talloc_asprintf(mem_ctx, "%s", name); + } else { + full_name = talloc_asprintf(mem_ctx, "%s\\%s", domain_name, name); + } if (!full_name) { DEBUG(0, ("talloc_asprintf failed!\n")); return NT_STATUS_NO_MEMORY; } + DEBUG(3,("rpc: name_to_sid name=%s\n", full_name)); + ws_name_return( full_name, WB_REPLACE_CHAR ); DEBUG(3,("name_to_sid [rpc] %s for domain %s\n", full_name?full_name:"", domain_name ));
