summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-12-01 16:22:09 +0000
committerLuke Leighton <lkcl@samba.org>1998-12-01 16:22:09 +0000
commit2d6525f477624c60de736b4256208a465731e419 (patch)
tree41d4f5f7484ab17e4a50be54478d2143b0ef00c5
parent67638b8d2b59dc992280af934346a5a1ef5fe62d (diff)
downloadsamba-2d6525f477624c60de736b4256208a465731e419.tar.gz
samba-2d6525f477624c60de736b4256208a465731e419.tar.bz2
samba-2d6525f477624c60de736b4256208a465731e419.zip
fix to domain_namemap (domain, ntname wrong way round oops)
stupid compile errors with file_rename() call just created. (This used to be commit f5cedb8c9618b83b63b5e2db867d238eebc7e13c)
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/lib/domain_namemap.c2
-rw-r--r--source3/lib/doscalls.c2
-rw-r--r--source3/lib/sids.c10
4 files changed, 10 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5de9e9657a..b362940a4c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -182,6 +182,7 @@ int dos_mkdir(char *dname,mode_t mode);
int dos_rmdir(char *dname);
int dos_chdir(char *dname);
int dos_utime(char *fname,struct utimbuf *times);
+int copy_reg(char *source, const char *dest);
int dos_rename(char *from, char *to);
int dos_chmod(char *fname,mode_t mode);
char *dos_getwd(char *unix_path);
@@ -264,7 +265,7 @@ void generate_wellknown_sids(void);
BOOL generate_sam_sid(char *domain_name);
BOOL map_domain_name_to_sid(DOM_SID *sid, char **nt_domain);
BOOL map_domain_sid_to_name(DOM_SID *sid, char *nt_domain);
-BOOL split_domain_name(char *fullname, char *domain, char *name);
+BOOL split_domain_name(const char *fullname, char *domain, char *name);
/*The following definitions come from lib/signal.c */
@@ -353,6 +354,7 @@ void putip(void *dest,void *src);
char *dns_to_netbios_name(char *dns_name);
int name_mangle( char *In, char *Out, char name_type );
BOOL file_exist(char *fname,SMB_STRUCT_STAT *sbuf);
+int file_rename(char *from, char *to);
time_t file_modtime(char *fname);
BOOL directory_exist(char *dname,SMB_STRUCT_STAT *st);
SMB_OFF_T file_size(char *file_name);
diff --git a/source3/lib/domain_namemap.c b/source3/lib/domain_namemap.c
index 09908be5fe..8bfaba287b 100644
--- a/source3/lib/domain_namemap.c
+++ b/source3/lib/domain_namemap.c
@@ -951,7 +951,7 @@ BOOL lookupsmbpwntnam(char *fullntname, DOM_NAME_MAP *gmep)
{
DEBUG(10,("lookupsmbpwntnam: nt user name %s\n", fullntname));
- if (!split_domain_name(fullntname, nt_name, nt_domain))
+ if (!split_domain_name(fullntname, nt_domain, nt_name))
{
return False;
}
diff --git a/source3/lib/doscalls.c b/source3/lib/doscalls.c
index 9cdb476d3d..b213ed81cd 100644
--- a/source3/lib/doscalls.c
+++ b/source3/lib/doscalls.c
@@ -143,7 +143,7 @@ int dos_utime(char *fname,struct utimbuf *times)
<warrenb@hpcvscdp.cv.hp.com>
**********************************************************/
-static int copy_reg(char *source, const char *dest)
+int copy_reg(char *source, const char *dest)
{
SMB_STRUCT_STAT source_stats;
int ifd;
diff --git a/source3/lib/sids.c b/source3/lib/sids.c
index 42f6dc68e2..cd64f1b097 100644
--- a/source3/lib/sids.c
+++ b/source3/lib/sids.c
@@ -312,9 +312,9 @@ BOOL generate_sam_sid(char *domain_name)
strupper(file_name);
pstrcat(sid_file, file_name);
- if (file_exists(machine_sid_file, NULL))
+ if (file_exist(machine_sid_file, NULL))
{
- if (file_exists(machine_sid_file, NULL))
+ if (file_exist(machine_sid_file, NULL))
{
DEBUG(0,("both %s and %s exist when only one should, unable to continue\n",
machine_sid_file, sid_file));
@@ -548,10 +548,10 @@ BOOL map_domain_sid_to_name(DOM_SID *sid, char *nt_domain)
}
/**************************************************************************
- splits a name of format \DOMAIN\name into its two components.
+ splits a name of format \DOMAIN\name or name into its two components.
sets the DOMAIN name to global_sam_name if it has not been specified.
***************************************************************************/
-BOOL split_domain_name(char *fullname, char *domain, char *name)
+BOOL split_domain_name(const char *fullname, char *domain, char *name)
{
fstring full_name;
char *p;
@@ -580,6 +580,6 @@ BOOL split_domain_name(char *fullname, char *domain, char *name)
fstrcpy(name, full_name);
}
- DEBUG(5,("name '%s' split into '%s\\%s'\n", fullname, domain, name));
+ DEBUG(10,("name '%s' split into domain:%s and nt name:%s'\n", fullname, domain, name));
return True;
}