sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-23 00:23:53 +03:00
Code Activity

fix to domain_namemap (domain, ntname wrong way round oops)

Browse Source 
stupid compile errors with file_rename() call just created.
This commit is contained in:
Luke Leighton
-
parent 51c1c31768
commit f5cedb8c96
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/include/proto.h
View File

@@ -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);

2
source/lib/domain_namemap.c
View File

@@ -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;
}

2
source/lib/doscalls.c
View File

@@ -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;

10
source/lib/sids.c
View File

@@ -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;
}