diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 12:41:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 16:38:14 +1000 |
| commit | 6021af4fd38d2a712dca42a3cacf8537007fd160 (patch) | |
| tree | 23673e8e5aa8f75c3b5635957dc92231f81fd2c1 /source3 | |
| parent | 724915f721819705c7cf5c850a24b32f815c07e3 (diff) | |
| download | samba-6021af4fd38d2a712dca42a3cacf8537007fd160.tar.gz samba-6021af4fd38d2a712dca42a3cacf8537007fd160.tar.bz2 samba-6021af4fd38d2a712dca42a3cacf8537007fd160.zip | |
libcli/smb Move attrib_string in common
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/lib/util.c | 20 | ||||
| -rwxr-xr-x | source3/wscript_build | 3 |
4 files changed, 4 insertions, 23 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4ec1868341..7c5da0971f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -479,7 +479,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \ lib/file_id.o lib/idmap_cache.o \ ../libcli/security/dom_sid.o ../libcli/security/security_descriptor.o \ - ../libcli/security/security_token.o ../libcli/security/util_sid.o + ../libcli/security/security_token.o ../libcli/security/util_sid.o \ + ../libcli/smb/util.o LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyroot.o LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ) diff --git a/source3/include/proto.h b/source3/include/proto.h index a697188abc..058356e0d6 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -630,7 +630,6 @@ bool file_exist_stat(const char *fname,SMB_STRUCT_STAT *sbuf, bool socket_exist(const char *fname); uint64_t get_file_size_stat(const SMB_STRUCT_STAT *sbuf); SMB_OFF_T get_file_size(char *file_name); -char *attrib_string(TALLOC_CTX *mem_ctx, uint16 mode); void show_msg(char *buf); void smb_set_enclen(char *buf,int len,uint16 enc_ctx_num); void smb_setlen(char *buf,int len); diff --git a/source3/lib/util.c b/source3/lib/util.c index d908ea86f0..8805197f2d 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -295,26 +295,6 @@ SMB_OFF_T get_file_size(char *file_name) } /******************************************************************* - Return a string representing an attribute for a file. -********************************************************************/ - -char *attrib_string(TALLOC_CTX *mem_ctx, uint16 mode) -{ - fstring attrstr; - - attrstr[0] = 0; - - if (mode & FILE_ATTRIBUTE_VOLUME) fstrcat(attrstr,"V"); - if (mode & FILE_ATTRIBUTE_DIRECTORY) fstrcat(attrstr,"D"); - if (mode & FILE_ATTRIBUTE_ARCHIVE) fstrcat(attrstr,"A"); - if (mode & FILE_ATTRIBUTE_HIDDEN) fstrcat(attrstr,"H"); - if (mode & FILE_ATTRIBUTE_SYSTEM) fstrcat(attrstr,"S"); - if (mode & FILE_ATTRIBUTE_READONLY) fstrcat(attrstr,"R"); - - return talloc_strdup(mem_ctx, attrstr); -} - -/******************************************************************* Show a smb message structure. ********************************************************************/ diff --git a/source3/wscript_build b/source3/wscript_build index e5384630c0..5a7998391c 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1066,7 +1066,8 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, source=CLIENT_SRC, deps='''talloc tdb cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN - msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA''', + msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA + LIBCLI_SMB_COMMON''', vars=locals()) bld.SAMBA3_BINARY('net', |