diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-04-06 15:34:22 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-04-06 08:58:05 +0200 |
| commit | 6d0be9e3d10e53ef91618d556505e09db64da84b (patch) | |
| tree | b4820f5d0186f3e11dca039dae7c3ec14564a8d8 | |
| parent | 49ab2df28a9399fef8d37677404304ac88115b45 (diff) | |
| download | samba-6d0be9e3d10e53ef91618d556505e09db64da84b.tar.gz samba-6d0be9e3d10e53ef91618d556505e09db64da84b.tar.bz2 samba-6d0be9e3d10e53ef91618d556505e09db64da84b.zip | |
s4-test: fixed a problem with very verbose NDR debug
lp.get("log level") returns a string, not an integer. It needs to be
cast to an integer for comparison with a number
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Apr 6 08:58:05 CEST 2011 on sn-devel-104
| -rwxr-xr-x | source4/scripting/bin/samba_spnupdate | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/join.py | 4 | ||||
| -rw-r--r-- | source4/scripting/python/samba/netcmd/drs.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate index 169c12ab00..1794f2bd26 100755 --- a/source4/scripting/bin/samba_spnupdate +++ b/source4/scripting/bin/samba_spnupdate @@ -196,7 +196,7 @@ def call_rodc_update(d): server = cldap_ret.pdc_dns_name try: binding_options = "seal" - if lp.get("log level") >= 5: + if int(lp.get("log level")) >= 5: binding_options += ",print" drs = drsuapi.drsuapi('ncacn_ip_tcp:%s[%s]' % (server, binding_options), lp, creds) (drs_handle, supported_extensions) = drs_utils.drs_DsBind(drs) diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py index 401f262154..c0aee71407 100644 --- a/source4/scripting/python/samba/join.py +++ b/source4/scripting/python/samba/join.py @@ -236,7 +236,7 @@ class dc_join(object): def drsuapi_connect(ctx): '''make a DRSUAPI connection to the server''' binding_options = "seal" - if ctx.lp.get("log level") >= 5: + if int(ctx.lp.get("log level")) >= 5: binding_options += ",print" binding_string = "ncacn_ip_tcp:%s[%s]" % (ctx.server, binding_options) ctx.drsuapi = drsuapi.drsuapi(binding_string, ctx.lp, ctx.creds) @@ -455,7 +455,7 @@ class dc_join(object): repl_creds = ctx.creds binding_options = "seal" - if ctx.lp.get("debug level") >= 5: + if int(ctx.lp.get("log level")) >= 5: binding_options += ",print" repl = drs_utils.drs_Replicate( "ncacn_ip_tcp:%s[%s]" % (ctx.server, binding_options), diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py index 69e164ef3e..56c0e39a59 100644 --- a/source4/scripting/python/samba/netcmd/drs.py +++ b/source4/scripting/python/samba/netcmd/drs.py @@ -38,7 +38,7 @@ import common def drsuapi_connect(ctx): '''make a DRSUAPI connection to the server''' binding_options = "seal" - if ctx.lp.get("log level") >= 5: + if int(ctx.lp.get("log level")) >= 5: binding_options += ",print" binding_string = "ncacn_ip_tcp:%s[%s]" % (ctx.server, binding_options) try: |