[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Feb 10 00:22:03 MST 2012
The branch, master has been updated
via a056238 s4-nbt_server: remove unused winsdb_get_seqnumber()
via 5c2a213 s3-libsmb: Remove unused kerberos_set_creds_enctype()
via 292974e s3-libsmb: Remove unused kerberos_compatible_enctypes
via 474fbfb s3-lib: Remove unused is_myworkgroup()
via 4512353 s3-charcnv: Remove unused rpcstr_push()
via a7835f4 s3-libsmb: Remove unused smb_krb5_mk_error()
via 3d63100 s3-param: Remove unused share_defined()
via a74e556 s4-lib/samba3: Remove unused smbpasswd_decode_acb_info()
via efc210d lib/util: Remove unused str_format_nbt_domain()
via fc5a214 charset: Remove unused strcmp_w()
via ac57def s4-lib/tls: remove unused tls_support()
via abc90d8 s4-cmdline: Remove unused popt_common_dont_ask()
via 40bf23d s3-lib: Remove unused pid_path()
via 7824fd5 s3-registry: Remove unused prs_uint8()
via 3b88c1e s3-charcnv: Remove unused pull_string_fn
via 983d205 charset: Remove unused iconv_talloc()
via 88298f9 build: Add --enable-coverage option to build with gcov support
via 45e681d heimdal: Re-run lexyacc.sh to remove #line statements
via 11c5301 heimdal_build: omit #line statments
via c38ba53 heimdal: Re-run lexyacc.sh
via 292b863 credentials: Show returned error_string in debug message
from 209d3c0 tests/source: Add wafsamba/ files to list of Python files to check.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a056238bcd67ca611a4856c73e1e947c184ac7f5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 11:25:58 2012 +1100
s4-nbt_server: remove unused winsdb_get_seqnumber()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Fri Feb 10 08:21:41 CET 2012 on sn-devel-104
commit 5c2a2135c92388659cf5b3d151272671cc2c5383
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 15:37:50 2012 +1100
s3-libsmb: Remove unused kerberos_set_creds_enctype()
Also remove the unused configure tests for krb5_c_enctype_compare.
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 292974ed0ca768ff1cffb85313a923e7d4bcf549
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 15:34:45 2012 +1100
s3-libsmb: Remove unused kerberos_compatible_enctypes
Also remove the unused configure tests for krb5_c_enctype_compare.
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 474fbfb7b712fe6be61505ca1796d0a3442a618a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 15:20:24 2012 +1100
s3-lib: Remove unused is_myworkgroup()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 45123530e52d9d096d5a01f02ba4672bd75b9305
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 13:40:52 2012 +1100
s3-charcnv: Remove unused rpcstr_push()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit a7835f473694dd7ff0ad7679e86fd4b2de7e23ce
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 13:29:06 2012 +1100
s3-libsmb: Remove unused smb_krb5_mk_error()
Also remove now-unused configure checks for krb5_mk_error().
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 3d63100890371b25a873afe0fd240d6069e274dc
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 13:24:46 2012 +1100
s3-param: Remove unused share_defined()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit a74e556a7c2446a25f796a76043d7cdf2d8745b3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 13:22:37 2012 +1100
s4-lib/samba3: Remove unused smbpasswd_decode_acb_info()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit efc210d5208a2da1fc33c7ebd745bf806dd26f62
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 12:49:45 2012 +1100
lib/util: Remove unused str_format_nbt_domain()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit fc5a214d71ac46d031098afb3b8ccf2de472ef94
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 12:46:38 2012 +1100
charset: Remove unused strcmp_w()
Found by callcatcher.
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit ac57defdb4171c5b8266083f18ce89fecf0a4032
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 11:28:19 2012 +1100
s4-lib/tls: remove unused tls_support()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit abc90d8f2e56e50496392f9bf05fed85628e07f1
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 11:18:43 2012 +1100
s4-cmdline: Remove unused popt_common_dont_ask()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 40bf23d862c92a3c519cffaf2175514a51ce3865
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 11:17:02 2012 +1100
s3-lib: Remove unused pid_path()
piddir.c calls lp_piddir() directly.
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 7824fd59547adeb84c367d5459ae5f55a3161328
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 11:13:29 2012 +1100
s3-registry: Remove unused prs_uint8()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 3b88c1e60596a88f09891df4696b6dd055bc6da8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 11:11:10 2012 +1100
s3-charcnv: Remove unused pull_string_fn
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 983d205486d4f2c518fbe02ef92b8884f5c9f2dc
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 9 10:49:49 2012 +1100
charset: Remove unused iconv_talloc()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html
Andrew Bartlett
commit 88298f97aea570c4a6c976c8fc1a6c2f61a0f2fb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 10 15:19:05 2012 +1100
build: Add --enable-coverage option to build with gcov support
This allows running lcov over the output.
Andrew Bartlett
commit 45e681d416bbb0e23b9884f5697234a69bb7f06e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 10 08:53:15 2012 +1100
heimdal: Re-run lexyacc.sh to remove #line statements
commit 11c530149113c50a24079ec58c2d99299b7df295
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 10 08:49:05 2012 +1100
heimdal_build: omit #line statments
This restores and finishes my original commit
80e23c68d83a7c9989f87d5a88a78bb76d222afc, reverted in
68c61a829b8487104483b23052b54c532fecb6ce
heimdal_build omit #line statments to allow valgrind to work again
This time however, the reason to omit line statements is that it
causes more trouble with the lcov code coverage system than the (nil)
value that these statements bring. Otherwise, we have to have a
special case to remove the .gcno and .gcda files for these generated
files.
Andrew Bartlett
commit c38ba53677ada7892ac29e43464580e0645debd5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 10 08:43:59 2012 +1100
heimdal: Re-run lexyacc.sh
commit 292b86394f1083dfbae34cdbf16c614d909797dc
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 10 08:14:59 2012 +1100
credentials: Show returned error_string in debug message
-----------------------------------------------------------------------
Summary of changes:
auth/credentials/credentials_krb5.c | 4 +-
lib/util/charset/charcnv.c | 114 -
lib/util/charset/charset.h | 6 -
lib/util/charset/util_unistr_w.c | 14 -
lib/util/charset/wscript_build | 2 +-
lib/util/samba_util.h | 6 -
lib/util/util_str.c | 35 -
selftest/wscript | 7 +
source3/configure.in | 43 -
source3/include/krb5_protos.h | 4 -
source3/include/proto.h | 11 -
source3/lib/charcnv.c | 43 -
source3/lib/util.c | 30 -
source3/libsmb/clikrb5.c | 58 -
source3/param/loadparm.c | 5 -
source3/registry/reg_parse_prs.c | 22 -
source3/registry/reg_parse_prs.h | 1 -
source3/wscript | 13 +-
source4/heimdal/lib/asn1/asn1parse.c | 4042 ++++++++++---------------------
source4/heimdal/lib/asn1/asn1parse.h | 334 +--
source4/heimdal/lib/asn1/lex.c | 130 +-
source4/heimdal/lib/com_err/lex.c | 52 +-
source4/heimdal/lib/com_err/parse.c | 2041 ++++------------
source4/heimdal/lib/com_err/parse.h | 97 +-
source4/heimdal/lib/hx509/lex.yy.c | 48 +-
source4/heimdal/lib/hx509/sel-gram.c | 2169 ++++-------------
source4/heimdal/lib/hx509/sel-gram.h | 100 +-
source4/heimdal/lib/hx509/sel-lex.c | 49 +-
source4/heimdal_build/lexyacc.sh | 16 +-
source4/heimdal_build/wscript_configure | 2 -
source4/lib/cmdline/popt_common.h | 2 -
source4/lib/cmdline/popt_credentials.c | 8 -
source4/lib/samba3/samba3.h | 1 -
source4/lib/samba3/smbpasswd.c | 65 -
source4/lib/tls/tls.c | 10 -
source4/lib/tls/tls.h | 5 -
source4/nbt_server/wins/winsdb.c | 26 -
37 files changed, 2410 insertions(+), 7205 deletions(-)
delete mode 100644 lib/util/charset/charcnv.c
Changeset truncated at 500 lines:
diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index 1e5600c..2892c4f 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -483,9 +483,9 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
&ccache, error_string);
if (ret) {
if (cli_credentials_get_kerberos_state(cred) == CRED_MUST_USE_KERBEROS) {
- DEBUG(1, ("Failed to get kerberos credentials (kerberos required): %s\n", error_message(ret)));
+ DEBUG(1, ("Failed to get kerberos credentials (kerberos required): %s\n", *error_string));
} else {
- DEBUG(4, ("Failed to get kerberos credentials: %s\n", error_message(ret)));
+ DEBUG(4, ("Failed to get kerberos credentials: %s\n", *error_string));
}
return ret;
}
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
deleted file mode 100644
index ba08310..0000000
--- a/lib/util/charset/charcnv.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Character set conversion Extensions
- Copyright (C) Igor Vergeichik <iverg at mail.ru> 2001
- Copyright (C) Andrew Tridgell 2001
- Copyright (C) Simo Sorce 2001
- Copyright (C) Jelmer Vernooij 2007
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-*/
-#include "includes.h"
-#include "system/iconv.h"
-
-/**
- * @file
- *
- * @brief Character-set conversion routines built on our iconv.
- *
- * @note Samba's internal character set (at least in the 3.0 series)
- * is always the same as the one for the Unix filesystem. It is
- * <b>not</b> necessarily UTF-8 and may be different on machines that
- * need i18n filenames to be compatible with Unix software. It does
- * have to be a superset of ASCII. All multibyte sequences must start
- * with a byte with the high bit set.
- *
- * @sa lib/iconv.c
- */
-
-/**
- * Convert string from one encoding to another, making error checking etc
- *
- * @param mem_ctx Memory context
- * @param cd Iconv handle
- * @param src pointer to source string (multibyte or singlebyte)
- * @param srclen length of the source string in bytes
- * @param dest pointer to destination string (multibyte or singlebyte)
- * @param destlen maximal length allowed for string
- * @returns the number of bytes occupied in the destination
- **/
-_PUBLIC_ ssize_t iconv_talloc(TALLOC_CTX *ctx,
- smb_iconv_t cd,
- void const *src, size_t srclen,
- void *dst)
-{
- size_t i_len, o_len, destlen;
- void **dest = (void **)dst;
- size_t retval;
- const char *inbuf = (const char *)src;
- char *outbuf, *ob;
-
- *dest = NULL;
-
- /* it is _very_ rare that a conversion increases the size by
- more than 3x */
- destlen = srclen;
- outbuf = NULL;
-convert:
- destlen = 2 + (destlen*3);
- ob = talloc_realloc(ctx, outbuf, char, destlen);
- if (!ob) {
- DEBUG(0, ("iconv_talloc: realloc failed!\n"));
- talloc_free(outbuf);
- return (size_t)-1;
- } else {
- outbuf = ob;
- }
-
- /* we give iconv 2 less bytes to allow us to terminate at the
- end */
- i_len = srclen;
- o_len = destlen-2;
- retval = smb_iconv(cd,
- &inbuf, &i_len,
- &outbuf, &o_len);
- if(retval == (size_t)-1) {
- const char *reason="unknown error";
- switch(errno) {
- case EINVAL:
- reason="Incomplete multibyte sequence";
- break;
- case E2BIG:
- goto convert;
- case EILSEQ:
- reason="Illegal multibyte sequence";
- break;
- }
- DEBUG(0,("Conversion error: %s - ",reason));
- dump_data(0, (const uint8_t *) inbuf, i_len);
- talloc_free(ob);
- return (size_t)-1;
- }
-
- destlen = (destlen-2) - o_len;
-
- /* guarantee null termination in all charsets */
- SSVAL(ob, destlen, 0);
-
- *dest = ob;
-
- return destlen;
-
-}
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index d731ad1..e4297e4 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -161,11 +161,6 @@ bool convert_string_error(charset_t from, charset_t to,
void *dest, size_t destlen,
size_t *converted_size);
-ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
- smb_iconv_t cd,
- void const *src, size_t srclen,
- void *dest);
-
extern struct smb_iconv_handle *global_iconv_handle;
struct smb_iconv_handle *get_iconv_handle(void);
struct smb_iconv_handle *get_iconv_testing_handle(TALLOC_CTX *mem_ctx,
@@ -241,7 +236,6 @@ smb_ucs2_t *strnrchr_w(const smb_ucs2_t *s, smb_ucs2_t c, unsigned int n);
smb_ucs2_t *strstr_w(const smb_ucs2_t *s, const smb_ucs2_t *ins);
bool strlower_w(smb_ucs2_t *s);
bool strupper_w(smb_ucs2_t *s);
-int strcmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b);
int strcasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b);
int strncasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len);
int strcmp_wa(const smb_ucs2_t *a, const char *b);
diff --git a/lib/util/charset/util_unistr_w.c b/lib/util/charset/util_unistr_w.c
index 72bd198..5225267 100644
--- a/lib/util/charset/util_unistr_w.c
+++ b/lib/util/charset/util_unistr_w.c
@@ -207,20 +207,6 @@ bool strupper_w(smb_ucs2_t *s)
return ret;
}
-int strcmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b)
-{
- smb_ucs2_t cpa, cpb;
-
- while ((*(COPY_UCS2_CHAR(&cpb,b))) && (*(COPY_UCS2_CHAR(&cpa,a)) == cpb)) {
- a++;
- b++;
- }
- return (*(COPY_UCS2_CHAR(&cpa,a)) - *(COPY_UCS2_CHAR(&cpb,b)));
- /* warning: if *a != *b and both are not 0 we return a random
- greater or lesser than 0 number not realted to which
- string is longer */
-}
-
static int strncmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len)
{
smb_ucs2_t cpa, cpb;
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build
index 621fed6..a3728f6 100644
--- a/lib/util/charset/wscript_build
+++ b/lib/util/charset/wscript_build
@@ -6,6 +6,6 @@ bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER',
bld.SAMBA_SUBSYSTEM('charset',
public_headers='charset.h',
- source='codepoints.c convert_string.c util_str.c util_unistr_w.c charcnv.c pull_push.c util_unistr.c weird.c charset_macosxfs.c',
+ source='codepoints.c convert_string.c util_str.c util_unistr_w.c pull_push.c util_unistr.c weird.c charset_macosxfs.c',
deps='DYNCONFIG ICONV_WRAPPER',
public_deps='talloc')
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 5ce2e5e..8e8e7c1 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -334,12 +334,6 @@ _PUBLIC_ char *rfc1738_escape_unescaped(TALLOC_CTX *mem_ctx, const char *url);
_PUBLIC_ char *rfc1738_escape_part(TALLOC_CTX *mem_ctx, const char *url);
/**
- format a string into length-prefixed dotted domain format, as used in NBT
- and in some ADS structures
-**/
-_PUBLIC_ const char *str_format_nbt_domain(TALLOC_CTX *mem_ctx, const char *s);
-
-/**
* Add a string to an array of strings.
*
* num should be a pointer to an integer that holds the current
diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index 388d788..9379304 100644
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -32,41 +32,6 @@
**/
/**
- format a string into length-prefixed dotted domain format, as used in NBT
- and in some ADS structures
-**/
-_PUBLIC_ const char *str_format_nbt_domain(TALLOC_CTX *mem_ctx, const char *s)
-{
- char *ret;
- int i;
- if (!s || !*s) {
- return talloc_strdup(mem_ctx, "");
- }
- ret = talloc_array(mem_ctx, char, strlen(s)+2);
- if (!ret) {
- return ret;
- }
-
- memcpy(ret+1, s, strlen(s)+1);
- ret[0] = '.';
-
- for (i=0;ret[i];i++) {
- if (ret[i] == '.') {
- char *p = strchr(ret+i+1, '.');
- if (p) {
- ret[i] = p-(ret+i+1);
- } else {
- ret[i] = strlen(ret+i+1);
- }
- }
- }
-
- talloc_set_name_const(ret, ret);
-
- return ret;
-}
-
-/**
* Parse a string containing a boolean value.
*
* val will be set to the read value.
diff --git a/selftest/wscript b/selftest/wscript
index 1bfa9f3..ab08c62 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -12,6 +12,9 @@ def set_options(opt):
opt.add_option('--enable-selftest',
help=("enable options necessary for selftest (default=no)"),
action="store_true", dest='enable_selftest', default=False)
+ opt.add_option('--enable-coverage',
+ help=("enable options necessary for code coverage reporting on selftest (default=no)"),
+ action="store_true", dest='enable_coverage', default=False)
opt.add_option('--with-selftest-prefix',
help=("specify location of selftest directory (default=./st)"),
action="store", dest='SELFTEST_PREFIX', default='./st')
@@ -69,6 +72,10 @@ def set_options(opt):
def configure(conf):
conf.env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX
+ conf.env.enable_coverage = Options.options.enable_coverage
+ if conf.env.enable_coverage:
+ conf.ADD_LDFLAGS('-lgcov', testflags=True)
+ conf.ADD_CFLAGS('--coverage')
def cmd_testonly(opt):
'''run tests without doing a build first'''
diff --git a/source3/configure.in b/source3/configure.in
index 1ce1a5b..ea212f6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3869,7 +3869,6 @@ if test x"$with_ads_support" != x"no"; then
AC_CHECK_FUNC_EXT(krb5_kt_free_entry, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_krbhst_init, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS)
- AC_CHECK_FUNC_EXT(krb5_c_enctype_compare, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_crypto_init, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_crypto_destroy, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_decode_ap_req, $KRB5_LIBS)
@@ -4068,30 +4067,6 @@ if test x"$with_ads_support" != x"no"; then
[Whether the krb5_ticket struct has a enc_part2 property])
fi
- AC_CACHE_CHECK([for keyblock in krb5_creds],
- samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS,[
- AC_TRY_COMPILE([#include <krb5.h>],
- [krb5_creds creds; krb5_keyblock kb; creds.keyblock = kb;],
- samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=yes,
- samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=no)])
-
- if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" = x"yes"; then
- AC_DEFINE(HAVE_KRB5_KEYBLOCK_IN_CREDS,1,
- [Whether the krb5_creds struct has a keyblock property])
- fi
-
- AC_CACHE_CHECK([for session in krb5_creds],
- samba_cv_HAVE_KRB5_SESSION_IN_CREDS,[
- AC_TRY_COMPILE([#include <krb5.h>],
- [krb5_creds creds; krb5_keyblock kb; creds.session = kb;],
- samba_cv_HAVE_KRB5_SESSION_IN_CREDS=yes,
- samba_cv_HAVE_KRB5_SESSION_IN_CREDS=no)])
-
- if test x"$samba_cv_HAVE_KRB5_SESSION_IN_CREDS" = x"yes"; then
- AC_DEFINE(HAVE_KRB5_SESSION_IN_CREDS,1,
- [Whether the krb5_creds struct has a session property])
- fi
-
AC_CACHE_CHECK([for keyvalue in krb5_keyblock],
samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE,[
AC_TRY_COMPILE([#include <krb5.h>],
@@ -4313,19 +4288,6 @@ if test x"$with_ads_support" != x"no"; then
[Whether the type krb5_addresses type exists])
fi
- AC_CACHE_CHECK([whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal],
- samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE, [
- AC_TRY_COMPILE([#include <krb5.h>],
- [
- krb5_mk_error(0,0,0);],
- samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE=yes,
- samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE=no)])
-
- if test x"$samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE" = x"yes"; then
- AC_DEFINE(HAVE_SHORT_KRB5_MK_ERROR_INTERFACE,1,
- [whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal])
- fi
-
if test x"$ac_cv_func_ext_krb5_enctype_to_string" = x"yes"; then
AC_CACHE_CHECK([for krb5_error_code krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **str)],
smb_krb5_cv_enctype_to_string_takes_krb5_context_arg,[
@@ -4415,11 +4377,6 @@ if test x"$with_ads_support" != x"no"; then
use_ads=no
fi
- if test x"$ac_cv_func_ext_krb5_c_enctype_compare" != x"yes"; then
- AC_MSG_WARN(krb5_c_enctype_compare not found in -lkrb5)
- use_ads=no
- fi
-
if test x"$ac_cv_func_ext_krb5_get_host_realm" != x"yes"
then
AC_MSG_WARN(krb5_get_host_realm not found in -lkrb5)
diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h
index f16cafd..1ec077c 100644
--- a/source3/include/krb5_protos.h
+++ b/source3/include/krb5_protos.h
@@ -110,10 +110,6 @@ void smb_krb5_get_init_creds_opt_free(krb5_context context,
krb5_get_init_creds_opt *opt);
krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
krb5_get_init_creds_opt **opt);
-krb5_error_code smb_krb5_mk_error(krb5_context context,
- krb5_error_code error_code,
- const krb5_principal server,
- krb5_data *reply);
krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry);
krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
krb5_enctype enctype,
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a94f6c4..b61fdf1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -76,13 +76,6 @@ size_t push_string_check_fn(void *dest, const char *src,
size_t push_string_base(const char *base, uint16 flags2,
void *dest, const char *src,
size_t dest_len, int flags);
-size_t pull_string_fn(const void *base_ptr,
- uint16 smb_flags2,
- char *dest,
- const void *src,
- size_t dest_len,
- size_t src_len,
- int flags);
size_t pull_string_talloc(TALLOC_CTX *ctx,
const void *base_ptr,
uint16 smb_flags2,
@@ -92,7 +85,6 @@ size_t pull_string_talloc(TALLOC_CTX *ctx,
int flags);
size_t align_string(const void *base_ptr, const char *p, int flags);
size_t dos_PutUniCode(char *dst,const char *src, size_t len, bool null_terminate);
-int rpcstr_push(void *dest, const char *src, size_t dest_len, int flags);
int rpcstr_push_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src);
/* The following definitions come from lib/conn_tdb.c */
@@ -528,7 +520,6 @@ void free_namearray(name_compare_entry *name_array);
bool fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
bool fcntl_getlock(int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid);
bool is_myname(const char *s);
-bool is_myworkgroup(const char *s);
void ra_lanman_string( const char *native_lanman );
const char *get_remote_arch_str(void);
void set_remote_arch(enum remote_arch_types type);
@@ -542,7 +533,6 @@ void *smb_xmalloc_array(size_t size, unsigned int count);
char *myhostname(void);
char *myhostname_upper(void);
char *lock_path(const char *name);
-char *pid_path(const char *name);
char *state_path(const char *name);
char *cache_path(const char *name);
bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent,
@@ -1579,7 +1569,6 @@ int lp_numservices(void);
void lp_dump(FILE *f, bool show_defaults, int maxtoprint);
void lp_dump_one(FILE * f, bool show_defaults, int snum);
int lp_servicenumber(const char *pszServiceName);
-bool share_defined(const char *service_name);
struct share_params *get_share_params(TALLOC_CTX *mem_ctx,
const char *sharename);
const char *volume_label(int snum);
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 7d7058c..ecf62e5 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -523,41 +523,6 @@ size_t push_string_base(const char *base, uint16 flags2,
/**
Copy a string from a unicode or ascii source (depending on
the packet flags) to a char* destination.
- Flags can have:
- STR_TERMINATE means the string in src is null terminated.
- STR_UNICODE means to force as unicode.
- STR_ASCII use ascii even with unicode packet.
- STR_NOALIGN means don't do alignment.
- if STR_TERMINATE is set then src_len is ignored is it is -1
- src_len is the length of the source area in bytes.
- Return the number of bytes occupied by the string in src.
- The resulting string in "dest" is always null terminated.
-**/
-
-size_t pull_string_fn(const void *base_ptr,
- uint16 smb_flags2,
- char *dest,
- const void *src,
- size_t dest_len,
- size_t src_len,
- int flags)
-{
- if ((base_ptr == NULL) && ((flags & (STR_ASCII|STR_UNICODE)) == 0)) {
- smb_panic("No base ptr to get flg2 and neither ASCII nor "
- "UNICODE defined");
- }
-
- if (!(flags & STR_ASCII) && \
- ((flags & STR_UNICODE || \
- (smb_flags2 & FLAGS2_UNICODE_STRINGS)))) {
- return pull_ucs2(base_ptr, dest, src, dest_len, src_len, flags);
- }
- return pull_ascii(dest, src, dest_len, src_len, flags);
-}
-
-/**
- Copy a string from a unicode or ascii source (depending on
- the packet flags) to a char* destination.
Variant that uses talloc.
Flags can have:
STR_TERMINATE means the string in src is null terminated.
@@ -630,14 +595,6 @@ size_t dos_PutUniCode(char *dst,const char *src, size_t len, bool null_terminate
}
-/* Converts a string from internal samba format to unicode
- */
-
-int rpcstr_push(void *dest, const char *src, size_t dest_len, int flags)
-{
- return push_ucs2(NULL, dest, src, dest_len, flags|STR_UNICODE|STR_NOALIGN);
-}
-
/* Converts a string from internal samba format to unicode. Always terminates.
* Actually just a wrapper round push_ucs2_talloc().
*/
diff --git a/source3/lib/util.c b/source3/lib/util.c
index b783c7e..822db43 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1215,23 +1215,6 @@ bool is_myname(const char *s)
}
/*******************************************************************
- Is the name specified our workgroup/domain.
- Returns true if it is equal, false otherwise.
-********************************************************************/
-
-bool is_myworkgroup(const char *s)
-{
--
Samba Shared Repository
More information about the samba-cvs
mailing list