sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Remove magic numbers. Standardize on macro. Move from safe_strcat to strlcat.

Browse Source
This commit is contained in:
Jeremy Allison 2011-05-03 14:08:27 -07:00
parent 8ff244ec2d
commit 0dcc75f2df
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/modules/vfs_afsacl.c
View File

@ -30,7 +30,7 @@
#include <afs/venus.h>
#include <afs/prs_fs.h>
#define MAXSIZE 2048
#define MAXSIZE 2049
extern const struct dom_sid global_sid_World;
extern const struct dom_sid global_sid_Builtin_Administrators;
@ -234,10 +234,10 @@ static bool parse_afs_acl(struct afs_acl *acl, const char *acl_str)
int nplus, nminus;
int aces;
char str[MAXSIZE+1];
char str[MAXSIZE];
char *p = str;
strncpy(str, acl_str, MAXSIZE);
strlcpy(str, acl_str, MAXSIZE);
if (sscanf(p, "%d", &nplus) != 1)
return False;
@ -313,16 +313,16 @@ static bool unparse_afs_acl(struct afs_acl *acl, char *acl_str)
}
fstr_sprintf(line, "%d\n", positives);
safe_strcat(acl_str, line, MAXSIZE);
strlcat(acl_str, line, MAXSIZE);
fstr_sprintf(line, "%d\n", negatives);
safe_strcat(acl_str, line, MAXSIZE);
strlcat(acl_str, line, MAXSIZE);
ace = acl->acelist;
while (ace != NULL) {
fstr_sprintf(line, "%s\t%d\n", ace->name, ace->rights);
safe_strcat(acl_str, line, MAXSIZE);
strlcat(acl_str, line, MAXSIZE);
ace = ace->next;
}
return True;
@ -897,7 +897,7 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
{
struct afs_acl old_afs_acl, new_afs_acl;
struct afs_acl dir_acl, file_acl;
char acl_string[2049];
char acl_string[MAXSIZE];
struct afs_iob iob;
int ret = -1;
char *name = NULL;