diff options
author | Gerald Carter <jerry@samba.org> | 2004-12-23 18:45:36 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2004-12-23 18:45:36 +0000 |
commit | b262548fec09659f46839dcf4c079176775f0871 (patch) | |
tree | 2f44f7f1cdce6d71d868626caea49fdfb82e1249 /source/client | |
parent | 8d91e07ef22ad3ed484b04bc4968380a24940696 (diff) | |
download | samba-b262548fec09659f46839dcf4c079176775f0871.tar.gz samba-b262548fec09659f46839dcf4c079176775f0871.tar.xz samba-b262548fec09659f46839dcf4c079176775f0871.zip |
r4348: syncing up for 3.0.11pre1
Diffstat (limited to 'source/client')
-rw-r--r-- | source/client/client.c | 183 | ||||
-rw-r--r-- | source/client/tree.c | 2 |
2 files changed, 182 insertions, 3 deletions
diff --git a/source/client/client.c b/source/client/client.c index 2d4a129be7c..7470a7ba5fd 100644 --- a/source/client/client.c +++ b/source/client/client.c @@ -1789,6 +1789,182 @@ static char *unix_mode_to_str(char *s, mode_t m) } /**************************************************************************** + Utility function for UNIX getfacl. +****************************************************************************/ + +static char *perms_to_string(fstring permstr, unsigned char perms) +{ + fstrcpy(permstr, "---"); + if (perms & SMB_POSIX_ACL_READ) { + permstr[0] = 'r'; + } + if (perms & SMB_POSIX_ACL_WRITE) { + permstr[1] = 'w'; + } + if (perms & SMB_POSIX_ACL_EXECUTE) { + permstr[2] = 'x'; + } + return permstr; +} + +/**************************************************************************** + UNIX getfacl. +****************************************************************************/ + +static int cmd_getfacl(void) +{ + pstring src, name; + uint16 major, minor; + uint32 caplow, caphigh; + char *retbuf = NULL; + size_t rb_size = 0; + SMB_STRUCT_STAT sbuf; + uint16 num_file_acls = 0; + uint16 num_dir_acls = 0; + uint16 i; + + if (!SERVER_HAS_UNIX_CIFS(cli)) { + d_printf("Server doesn't support UNIX CIFS calls.\n"); + return 1; + } + + if (!cli_unix_extensions_version(cli, &major, &minor, &caplow, &caphigh)) { + d_printf("Can't get UNIX CIFS version from server.\n"); + return 1; + } + + if (!(caplow & CIFS_UNIX_POSIX_ACLS_CAP)) { + d_printf("This server supports UNIX extensions but doesn't support POSIX ACLs.\n"); + return 1; + } + + pstrcpy(src,cur_dir); + + if (!next_token_nr(NULL,name,NULL,sizeof(name))) { + d_printf("stat file\n"); + return 1; + } + + pstrcat(src,name); + + if (!cli_unix_stat(cli, src, &sbuf)) { + d_printf("%s getfacl doing a stat on file %s\n", + cli_errstr(cli), src); + return 1; + } + + if (!cli_unix_getfacl(cli, src, &rb_size, &retbuf)) { + d_printf("%s getfacl file %s\n", + cli_errstr(cli), src); + return 1; + } + + /* ToDo : Print out the ACL values. */ + if (SVAL(retbuf,0) != SMB_POSIX_ACL_VERSION || rb_size < 6) { + d_printf("getfacl file %s, unknown POSIX acl version %u.\n", + src, (unsigned int)CVAL(retbuf,0) ); + SAFE_FREE(retbuf); + return 1; + } + + num_file_acls = SVAL(retbuf,2); + num_dir_acls = SVAL(retbuf,4); + if (rb_size != SMB_POSIX_ACL_HEADER_SIZE + SMB_POSIX_ACL_ENTRY_SIZE*(num_file_acls+num_dir_acls)) { + d_printf("getfacl file %s, incorrect POSIX acl buffer size (should be %u, was %u).\n", + src, + (unsigned int)(SMB_POSIX_ACL_HEADER_SIZE + SMB_POSIX_ACL_ENTRY_SIZE*(num_file_acls+num_dir_acls)), + (unsigned int)rb_size); + + SAFE_FREE(retbuf); + return 1; + } + + d_printf("# file: %s\n", src); + d_printf("# owner: %u\n# group: %u\n", (unsigned int)sbuf.st_uid, (unsigned int)sbuf.st_gid); + + if (num_file_acls == 0 && num_dir_acls == 0) { + d_printf("No acls found.\n"); + } + + for (i = 0; i < num_file_acls; i++) { + uint32 uorg; + fstring permstring; + unsigned char tagtype = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+(i*SMB_POSIX_ACL_ENTRY_SIZE)); + unsigned char perms = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+(i*SMB_POSIX_ACL_ENTRY_SIZE)+1); + + switch(tagtype) { + case SMB_POSIX_ACL_USER_OBJ: + d_printf("user::"); + break; + case SMB_POSIX_ACL_USER: + uorg = IVAL(retbuf,SMB_POSIX_ACL_HEADER_SIZE+(i*SMB_POSIX_ACL_ENTRY_SIZE)+2); + d_printf("user:%u:", uorg); + break; + case SMB_POSIX_ACL_GROUP_OBJ: + d_printf("group::"); + break; + case SMB_POSIX_ACL_GROUP: + uorg = IVAL(retbuf,SMB_POSIX_ACL_HEADER_SIZE+(i*SMB_POSIX_ACL_ENTRY_SIZE)+2); + d_printf("group:%u", uorg); + break; + case SMB_POSIX_ACL_MASK: + d_printf("mask::"); + break; + case SMB_POSIX_ACL_OTHER: + d_printf("other::"); + break; + default: + d_printf("getfacl file %s, incorrect POSIX acl tagtype (%u).\n", + src, (unsigned int)tagtype ); + SAFE_FREE(retbuf); + return 1; + } + + d_printf("%s\n", perms_to_string(permstring, perms)); + } + + for (i = 0; i < num_dir_acls; i++) { + uint32 uorg; + fstring permstring; + unsigned char tagtype = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+((i+num_file_acls)*SMB_POSIX_ACL_ENTRY_SIZE)); + unsigned char perms = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+((i+num_file_acls)*SMB_POSIX_ACL_ENTRY_SIZE)+1); + + switch(tagtype) { + case SMB_POSIX_ACL_USER_OBJ: + d_printf("default:user::"); + break; + case SMB_POSIX_ACL_USER: + uorg = IVAL(retbuf,SMB_POSIX_ACL_HEADER_SIZE+((i+num_file_acls)*SMB_POSIX_ACL_ENTRY_SIZE)+2); + d_printf("default:user:%u:", uorg); + break; + case SMB_POSIX_ACL_GROUP_OBJ: + d_printf("default:group::"); + break; + case SMB_POSIX_ACL_GROUP: + uorg = IVAL(retbuf,SMB_POSIX_ACL_HEADER_SIZE+((i+num_file_acls)*SMB_POSIX_ACL_ENTRY_SIZE)+2); + d_printf("default:group:%u", uorg); + break; + case SMB_POSIX_ACL_MASK: + d_printf("default:mask::"); + break; + case SMB_POSIX_ACL_OTHER: + d_printf("default:other::"); + break; + default: + d_printf("getfacl file %s, incorrect POSIX acl tagtype (%u).\n", + src, (unsigned int)tagtype ); + SAFE_FREE(retbuf); + return 1; + } + + d_printf("%s\n", perms_to_string(permstring, perms)); + } + + SAFE_FREE(retbuf); + return 0; +} + +/**************************************************************************** UNIX stat. ****************************************************************************/ @@ -2355,6 +2531,7 @@ static struct {"du",cmd_du,"<mask> computes the total size of the current directory",{COMPL_REMOTE,COMPL_NONE}}, {"exit",cmd_quit,"logoff the server",{COMPL_NONE,COMPL_NONE}}, {"get",cmd_get,"<remote name> [local name] get a file",{COMPL_REMOTE,COMPL_LOCAL}}, + {"getfacl",cmd_getfacl,"<file name> get the POSIX ACL on a file (UNIX extensions only)",{COMPL_REMOTE,COMPL_LOCAL}}, {"hardlink",cmd_hardlink,"<src> <dest> create a Windows hard link",{COMPL_REMOTE,COMPL_REMOTE}}, {"help",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}}, {"history",cmd_history,"displays the command history",{COMPL_NONE,COMPL_NONE}}, @@ -2639,10 +2816,12 @@ static char **completion_fn(const char *text, int start, int end) return NULL; } else { char **matches; - int i, len, samelen, count=1; + int i, len, samelen = 0, count=1; matches = SMB_MALLOC_ARRAY(char *, MAX_COMPLETIONS); - if (!matches) return NULL; + if (!matches) { + return NULL; + } matches[0] = NULL; len = strlen(text); diff --git a/source/client/tree.c b/source/client/tree.c index 97ad7742e31..5071c45dbc9 100644 --- a/source/client/tree.c +++ b/source/client/tree.c @@ -129,7 +129,7 @@ char *get_path(GtkWidget *item) struct tree_data *make_tree_data(guint32 type, const char *name) { - struct tree_data *p = (struct tree_data *)malloc(sizeof(struct tree_data)); + struct tree_data *p = SMB_MALLOC_P(struct tree_data); if (p) { |