summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-12-02 16:20:36 +0000
committerLuke Leighton <lkcl@samba.org>1998-12-02 16:20:36 +0000
commit1bf14231e1b3a114b46f92bb96bdd55b554570bc (patch)
tree81f8fa8a3134af2fb3acb62a8c8640c17058d6ec
parent137f9c7042678bbc4b4a351364eb3819677183bd (diff)
downloadsamba-1bf14231e1b3a114b46f92bb96bdd55b554570bc.tar.gz
samba-1bf14231e1b3a114b46f92bb96bdd55b554570bc.tar.bz2
samba-1bf14231e1b3a114b46f92bb96bdd55b554570bc.zip
issues spotted by andrej: %s\\%s not %s\%s
(This used to be commit 779a7aa30d4b8a3c8ca1d817a3fd9886c0437def)
-rw-r--r--source3/lib/domain_namemap.c4
-rw-r--r--source3/rpc_client/cli_lsarpc.c1
-rw-r--r--source3/rpc_server/srv_lookup.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/domain_namemap.c b/source3/lib/domain_namemap.c
index 8bfaba287b..407de944a7 100644
--- a/source3/lib/domain_namemap.c
+++ b/source3/lib/domain_namemap.c
@@ -303,7 +303,7 @@ static BOOL make_mydomain_sid(DOM_NAME_MAP *grp, DOM_MAP_TYPE type)
{
if (type != DOM_MAP_USER)
{
- DEBUG(0,("well-known NT user %s\%s listed in wrong map file\n",
+ DEBUG(0,("well-known NT user %s\\%s listed in wrong map file\n",
grp->nt_domain, grp->nt_name));
return False;
}
@@ -313,7 +313,7 @@ static BOOL make_mydomain_sid(DOM_NAME_MAP *grp, DOM_MAP_TYPE type)
{
if (type != DOM_MAP_DOMAIN)
{
- DEBUG(0,("well-known NT group %s\%s listed in wrong map file\n",
+ DEBUG(0,("well-known NT group %s\\%s listed in wrong map file\n",
grp->nt_domain, grp->nt_name));
return False;
}
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 087ee5dade..81202fedb5 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -310,6 +310,7 @@ BOOL do_lsa_lookup_sids(struct cli_state *cli,
fstrcpy(name , unistr2_to_str(&t_names.uni_name[i]));
memset(full_name, 0, sizeof(full_name));
+
slprintf(full_name, sizeof(full_name)-1, "%s\\%s",
dom_name, name);
diff --git a/source3/rpc_server/srv_lookup.c b/source3/rpc_server/srv_lookup.c
index fc73edc4ed..c97a4cd0b9 100644
--- a/source3/rpc_server/srv_lookup.c
+++ b/source3/rpc_server/srv_lookup.c
@@ -453,7 +453,7 @@ uint32 lookup_added_alias_name(const char *als_name, const char *domain,
LOCAL_GRP *als = NULL;
(*type) = SID_NAME_ALIAS;
- DEBUG(5,("lookup_added_alias_name: name: %s\%s", domain, als_name));
+ DEBUG(5,("lookup_added_alias_name: name: %s\\%s", domain, als_name));
if (!strequal(domain, global_sam_name))
{