[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Apr 13 22:28:02 MDT 2011
The branch, master has been updated
via 3d7998b s3-lib Remove very unused (#if 0) strncpyn
via b1873be s3-lib Remove unused string_append
via 72dcf6d s3-lib Move unix_strlower and unix_strupper to their only users.
via aad2c19 s3-lib Remove unused str_ascii_charnum()
via 9d62ee2 s3-lib Move strisnormal to it's only user in mangle_hash.c
via 35fca85 libcli/ldap Re-add ldap_ndr.h as a public header
from 29c0c37 s4/libcli: do not use netbios name in NTLMv2 blobs w/o spnego
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3d7998bce1f3366e99f5b4f42d3eae934c1539b7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 14 12:50:19 2011 +1000
s3-lib Remove very unused (#if 0) strncpyn
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Thu Apr 14 06:27:31 CEST 2011 on sn-devel-104
commit b1873be59b7858253d065db5fbb2ca5791de7476
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 14 12:47:45 2011 +1000
s3-lib Remove unused string_append
commit 72dcf6d47c53c7f4f9b62567207b7bf38be1f022
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 14 12:42:52 2011 +1000
s3-lib Move unix_strlower and unix_strupper to their only users.
commit aad2c19da7609e1a4c08ef11aab03c29a30090d8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 14 12:34:51 2011 +1000
s3-lib Remove unused str_ascii_charnum()
commit 9d62ee2a815570b24a099b3960ed23942eebb3e7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 14 12:31:18 2011 +1000
s3-lib Move strisnormal to it's only user in mangle_hash.c
commit 35fca856604f32c1a30b018dcd05e7f43fafae5d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 14 12:12:00 2011 +1000
libcli/ldap Re-add ldap_ndr.h as a public header
as noticed by Brad Hards
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
libcli/ldap/wscript_build | 2 +-
source3/include/proto.h | 5 --
source3/lib/charcnv.c | 41 ---------------
source3/lib/util_str.c | 119 +++++++++++++++-----------------------------
source3/smbd/mangle_hash.c | 13 +++++
5 files changed, 55 insertions(+), 125 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build
index 63a2de1..211a320 100644
--- a/libcli/ldap/wscript_build
+++ b/libcli/ldap/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_LIBRARY('cli-ldap-common',
source='ldap_message.c ldap_ndr.c',
public_deps='errors talloc ldb',
- public_headers='ldap_message.h ldap_errors.h',
+ public_headers='ldap_message.h ldap_errors.h ldap_ndr.h',
deps='samba-util asn1util NDR_SECURITY tevent',
private_library=True
)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index be2915f..4362ddb 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -83,10 +83,8 @@ bool convert_string_error(charset_t from, charset_t to,
void const *src, size_t srclen,
void *dest, size_t destlen,
size_t *converted_size);
-bool unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen);
char *talloc_strdup_upper(TALLOC_CTX *ctx, const char *s);
char *strupper_talloc(TALLOC_CTX *ctx, const char *s);
-bool unix_strlower(const char *src, size_t srclen, char *dest, size_t destlen);
char *talloc_strdup_lower(TALLOC_CTX *ctx, const char *s);
char *strlower_talloc(TALLOC_CTX *ctx, const char *s);
size_t ucs2_align(const void *base_ptr, const void *p, int flags);
@@ -958,11 +956,9 @@ int StrnCaseCmp(const char *s, const char *t, size_t len);
bool strnequal(const char *s1,const char *s2,size_t n);
bool strcsequal(const char *s1,const char *s2);
void strnorm(char *s, int case_default);
-bool strisnormal(const char *s, int case_default);
char *push_skip_string(char *buf);
char *skip_string(const char *base, size_t len, char *buf);
size_t str_charnum(const char *s);
-size_t str_ascii_charnum(const char *s);
bool trim_char(char *s,char cfront,char cback);
bool strhasupper(const char *s);
bool strhaslower(const char *s);
@@ -1033,7 +1029,6 @@ int ipstr_list_parse(const char *ipstr_list, struct ip_service **ip_list);
void ipstr_list_free(char* ipstr_list);
uint64_t STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr);
SMB_OFF_T conv_str_size(const char * str);
-void string_append(char **left, const char *right);
bool add_string_to_array(TALLOC_CTX *mem_ctx,
const char *str, const char ***strings,
int *num);
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 5c01052..bde6510 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -56,26 +56,6 @@ void init_iconv(void)
true, global_iconv_handle);
}
-bool unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen)
-{
- size_t size;
- smb_ucs2_t *buffer;
- bool ret;
-
- if (!push_ucs2_talloc(talloc_tos(), &buffer, src, &size)) {
- return (size_t)-1;
- }
-
- if (!strupper_w(buffer) && (dest == src)) {
- TALLOC_FREE(buffer);
- return srclen;
- }
-
- ret = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen, &size);
- TALLOC_FREE(buffer);
- return ret;
-}
-
/**
talloc_strdup() a unix string to upper case.
**/
@@ -141,27 +121,6 @@ char *strupper_talloc(TALLOC_CTX *ctx, const char *s) {
}
-bool unix_strlower(const char *src, size_t srclen, char *dest, size_t destlen)
-{
- size_t size;
- smb_ucs2_t *buffer = NULL;
- bool ret;
-
- if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF16LE, src, srclen,
- (void **)(void *)&buffer, &size))
- {
- smb_panic("failed to create UCS2 buffer");
- }
- if (!strlower_w(buffer) && (dest == src)) {
- TALLOC_FREE(buffer);
- return srclen;
- }
- ret = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen, &size);
- TALLOC_FREE(buffer);
- return ret;
-}
-
-
char *talloc_strdup_lower(TALLOC_CTX *ctx, const char *s)
{
size_t converted_size;
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 13aa78c..13b4150 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -221,19 +221,6 @@ void strnorm(char *s, int case_default)
}
/**
- Check if a string is in "normal" case.
-**/
-
-bool strisnormal(const char *s, int case_default)
-{
- if (case_default == CASE_UPPER)
- return(!strhaslower(s));
-
- return(!strhasupper(s));
-}
-
-
-/**
* Skip past some strings in a buffer - old version - no checks.
* **/
@@ -287,24 +274,6 @@ size_t str_charnum(const char *s)
return ret;
}
-/**
- Count the number of characters in a string. Normally this will
- be the same as the number of bytes in a string for single byte strings,
- but will be different for multibyte.
-**/
-
-size_t str_ascii_charnum(const char *s)
-{
- size_t ret, converted_size;
- char *tmpbuf2 = NULL;
- if (!push_ascii_talloc(talloc_tos(), &tmpbuf2, s, &converted_size)) {
- return 0;
- }
- ret = strlen(tmpbuf2);
- TALLOC_FREE(tmpbuf2);
- return ret;
-}
-
bool trim_char(char *s,char cfront,char cback)
{
bool ret = false;
@@ -505,31 +474,6 @@ char *StrnCpy(char *dest,const char *src,size_t n)
return(dest);
}
-#if 0
-/**
- Like strncpy but copies up to the character marker. always null terminates.
- returns a pointer to the character marker in the source string (src).
-**/
-
-static char *strncpyn(char *dest, const char *src, size_t n, char c)
-{
- char *p;
- size_t str_len;
-
- p = strchr_m(src, c);
- if (p == NULL) {
- DEBUG(5, ("strncpyn: separator character (%c) not found\n", c));
- return NULL;
- }
-
- str_len = PTR_DIFF(p, src);
- strncpy(dest, src, MIN(n, str_len));
- dest[str_len] = '\0';
-
- return p;
-}
-#endif
-
/**
Check if a string is part of a list.
**/
@@ -1091,6 +1035,27 @@ char *strstr_m(const char *src, const char *findstr)
return retp;
}
+static bool unix_strlower(const char *src, size_t srclen, char *dest, size_t destlen)
+{
+ size_t size;
+ smb_ucs2_t *buffer = NULL;
+ bool ret;
+
+ if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF16LE, src, srclen,
+ (void **)(void *)&buffer, &size))
+ {
+ smb_panic("failed to create UCS2 buffer");
+ }
+ if (!strlower_w(buffer) && (dest == src)) {
+ TALLOC_FREE(buffer);
+ return srclen;
+ }
+ ret = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen, &size);
+ TALLOC_FREE(buffer);
+ return ret;
+}
+
+
/**
Convert a string to lower case.
**/
@@ -1125,6 +1090,26 @@ void strlower_m(char *s)
errno = errno_save;
}
+static bool unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen)
+{
+ size_t size;
+ smb_ucs2_t *buffer;
+ bool ret;
+
+ if (!push_ucs2_talloc(talloc_tos(), &buffer, src, &size)) {
+ return (size_t)-1;
+ }
+
+ if (!strupper_w(buffer) && (dest == src)) {
+ TALLOC_FREE(buffer);
+ return srclen;
+ }
+
+ ret = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen, &size);
+ TALLOC_FREE(buffer);
+ return ret;
+}
+
/**
Convert a string to upper case.
**/
@@ -1540,28 +1525,6 @@ SMB_OFF_T conv_str_size(const char * str)
return lval;
}
-void string_append(char **left, const char *right)
-{
- int new_len = strlen(right) + 1;
-
- if (*left == NULL) {
- *left = (char *)SMB_MALLOC(new_len);
- if (*left == NULL) {
- return;
- }
- *left[0] = '\0';
- } else {
- new_len += strlen(*left);
- *left = (char *)SMB_REALLOC(*left, new_len);
- }
-
- if (*left == NULL) {
- return;
- }
-
- safe_strcat(*left, right, new_len-1);
-}
-
/* Append an sprintf'ed string. Double buffer size on demand. Usable without
* error checking in between. The indiation that something weird happened is
* string==NULL */
diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index ebfacd1..d98b350 100644
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -587,6 +587,19 @@ static bool lookup_name_from_8_3(TALLOC_CTX *ctx,
return *out ? True : False;
}
+/**
+ Check if a string is in "normal" case.
+**/
+
+static bool strisnormal(const char *s, int case_default)
+{
+ if (case_default == CASE_UPPER)
+ return(!strhaslower(s));
+
+ return(!strhasupper(s));
+}
+
+
/*****************************************************************************
Do the actual mangling to 8.3 format.
*****************************************************************************/
--
Samba Shared Repository
More information about the samba-cvs
mailing list