[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Thu Jun 24 02:47:29 MDT 2010
The branch, master has been updated
via 0be1820... s4-ldb: use CHECK_XSLTPROC_MANPAGES()
via f6e46ee... build: check if the manpages stylesheet is available locally
via 4cb423f... s4-python: python is not always in /usr/bin
from 41cdcd5... s4:provision.ldif - fix the number of available RIDs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0be1820718202bd73a0e756c35a9b21edbbc563b
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Jun 24 16:03:02 2010 +1000
s4-ldb: use CHECK_XSLTPROC_MANPAGES()
commit f6e46ee0fba25efecb78412a61270d7e70bb6f7d
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Jun 24 16:02:43 2010 +1000
build: check if the manpages stylesheet is available locally
this avoids trying to fetch the stylesheet from the internet. If we
can't process the stylesheet with --nonet at configure time then don't
build manpages.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
commit 4cb423f52737d980132709fe63bc3194b9307880
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Jun 24 14:33:58 2010 +1000
s4-python: python is not always in /usr/bin
Using "#!/usr/bin/env python" is more portable. It still isn't ideal
though, as we should really use the python path found at configure
time. We do that in many places already, but some don't.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_conftests.py | 36 +++++++++++++++++---
buildtools/wafsamba/wafsamba.py | 6 ++--
lib/subunit/python/subunit/run.py | 2 +-
lib/tdb/wscript | 3 +-
source4/auth/credentials/tests/bindings.py | 2 +-
source4/auth/gensec/tests/bindings.py | 2 +-
source4/auth/tests/bindings.py | 2 +-
.../samdb/ldb_modules/tests/possibleinferiors.py | 2 +-
source4/dsdb/samdb/ldb_modules/tests/samba3sam.py | 2 +-
source4/lib/ldb/tests/python/dsdb_schema_info.py | 2 +-
source4/lib/ldb/wscript | 2 +-
source4/lib/policy/tests/python/bindings.py | 2 +-
source4/librpc/rpc/dcerpc.py | 2 +-
source4/param/tests/bindings.py | 2 +-
source4/script/depfilter.py | 2 +-
source4/scripting/bin/testparm | 2 +-
source4/scripting/python/examples/netbios.py | 2 +-
source4/scripting/python/examples/samr.py | 2 +-
source4/scripting/python/examples/winreg.py | 2 +-
source4/scripting/python/samba/__init__.py | 2 +-
source4/scripting/python/samba/getopt.py | 2 +-
source4/scripting/python/samba/hostconfig.py | 2 +-
source4/scripting/python/samba/idmap.py | 2 +-
.../python/samba/ms_display_specifiers.py | 2 +-
source4/scripting/python/samba/ndr.py | 2 +-
source4/scripting/python/samba/netcmd/__init__.py | 2 +-
.../scripting/python/samba/netcmd/domainlevel.py | 2 +-
source4/scripting/python/samba/netcmd/dsacl.py | 2 +-
.../scripting/python/samba/netcmd/enableaccount.py | 2 +-
source4/scripting/python/samba/netcmd/export.py | 2 +-
source4/scripting/python/samba/netcmd/fsmo.py | 2 +-
source4/scripting/python/samba/netcmd/group.py | 2 +-
source4/scripting/python/samba/netcmd/join.py | 2 +-
source4/scripting/python/samba/netcmd/machinepw.py | 2 +-
source4/scripting/python/samba/netcmd/netacl.py | 2 +-
source4/scripting/python/samba/netcmd/newuser.py | 2 +-
source4/scripting/python/samba/netcmd/ntacl.py | 2 +-
.../scripting/python/samba/netcmd/pwsettings.py | 2 +-
source4/scripting/python/samba/netcmd/setexpiry.py | 2 +-
.../scripting/python/samba/netcmd/setpassword.py | 2 +-
source4/scripting/python/samba/netcmd/time.py | 2 +-
source4/scripting/python/samba/netcmd/user.py | 2 +-
source4/scripting/python/samba/netcmd/vampire.py | 2 +-
source4/scripting/python/samba/ntacls.py | 2 +-
source4/scripting/python/samba/samba3.py | 2 +-
source4/scripting/python/samba/samdb.py | 2 +-
source4/scripting/python/samba/shares.py | 2 +-
source4/scripting/python/samba/tests/__init__.py | 2 +-
.../python/samba/tests/dcerpc/__init__.py | 2 +-
.../scripting/python/samba/tests/dcerpc/bare.py | 2 +-
.../scripting/python/samba/tests/dcerpc/misc.py | 2 +-
.../python/samba/tests/dcerpc/registry.py | 2 +-
.../scripting/python/samba/tests/dcerpc/rpcecho.py | 2 +-
source4/scripting/python/samba/tests/dcerpc/sam.py | 2 +-
.../scripting/python/samba/tests/dcerpc/unix.py | 2 +-
source4/scripting/python/samba/tests/dsdb.py | 2 +-
source4/scripting/python/samba/tests/netcmd.py | 2 +-
source4/scripting/python/samba/tests/ntacls.py | 2 +-
source4/scripting/python/samba/tests/provision.py | 2 +-
source4/scripting/python/samba/tests/samba3.py | 2 +-
source4/scripting/python/samba/tests/samdb.py | 2 +-
source4/scripting/python/samba/tests/shares.py | 2 +-
source4/scripting/python/samba/tests/upgrade.py | 2 +-
.../python/samba/tests/upgradeprovision.py | 2 +-
.../python/samba/tests/upgradeprovisionneeddc.py | 2 +-
source4/scripting/python/samba/tests/xattr.py | 2 +-
source4/scripting/python/samba/upgrade.py | 2 +-
source4/scripting/python/samba/upgradehelpers.py | 2 +-
source4/scripting/python/samba_external/missing.py | 2 +-
source4/torture/libnet/python/samr-test.py | 2 +-
source4/web_server/swat/__init__.py | 2 +-
71 files changed, 103 insertions(+), 78 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index c95a887..c6f8901 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -242,7 +242,7 @@ WriteMakefile(
@conf
-def CHECK_COMMAND(conf, cmd, msg=None, define=None, on_target=True):
+def CHECK_COMMAND(conf, cmd, msg=None, define=None, on_target=True, boolean=False):
'''run a command and return result'''
if msg is None:
msg = 'Checking %s' % ' '.join(cmd)
@@ -255,10 +255,15 @@ def CHECK_COMMAND(conf, cmd, msg=None, define=None, on_target=True):
except:
conf.COMPOUND_END(False)
return False
- ret = ret.strip()
- conf.COMPOUND_END(ret)
- if define:
- conf.DEFINE(define, ret, quote=True)
+ if boolean:
+ conf.COMPOUND_END('ok')
+ if define:
+ conf.DEFINE(define, '1')
+ else:
+ ret = ret.strip()
+ conf.COMPOUND_END(ret)
+ if define:
+ conf.DEFINE(define, ret, quote=True)
return ret
@@ -304,4 +309,25 @@ def CHECK_INLINE(conf):
conf.COMPOUND_END(i)
return ret
+ at conf
+def CHECK_XSLTPROC_MANPAGES(conf):
+ '''check if xsltproc can run with the given stylesheets'''
+
+ stylesheets='http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
+ if not conf.CONFIG_SET('XSLTPROC'):
+ conf.find_program('xsltproc', var='XSLTPROC')
+ if not conf.CONFIG_SET('XSLTPROC'):
+ return False
+
+ for s in TO_LIST(stylesheets):
+ if not conf.CONFIG_SET('XSLTPROC_%s' % s):
+ ret = conf.CHECK_COMMAND('%s --nonet %s 2> /dev/null' % (conf.env.XSLTPROC, s),
+ msg='Checking for stylesheet %s' % s,
+ define=None, on_target=False,
+ boolean=True)
+ if not ret:
+ return False
+ conf.env['XSLTPROC_%s' % s] = True
+ conf.env['XSLTPROC_MANPAGES'] = True
+ return True
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index a1718d3..5ffe4b8 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -213,7 +213,7 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None:
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
- if manpages is not None and 'XSLTPROC' in bld.env and bld.env['XSLTPROC']:
+ if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
bld.MANPAGES(manpages)
@@ -304,7 +304,7 @@ def SAMBA_BINARY(bld, binname, source,
if subsystem_name is not None:
bld.TARGET_ALIAS(subsystem_name, binname)
- if manpages is not None and 'XSLTPROC' in bld.env and bld.env['XSLTPROC']:
+ if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
bld.MANPAGES(manpages)
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
@@ -873,7 +873,7 @@ def MANPAGES(bld, manpages):
source=source,
target=m,
group='final',
- rule='${XSLTPROC} -o ${TGT} ${MAN_XSL} ${SRC}'
+ rule='${XSLTPROC} -o ${TGT} --nonet ${MAN_XSL} ${SRC}'
)
bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
Build.BuildContext.MANPAGES = MANPAGES
diff --git a/lib/subunit/python/subunit/run.py b/lib/subunit/python/subunit/run.py
index 01c0b0e..e57939f 100755
--- a/lib/subunit/python/subunit/run.py
+++ b/lib/subunit/python/subunit/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Simple subunit testrunner for python
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index a1776e5..a7afa98 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -39,8 +39,7 @@ def configure(conf):
conf.env.disable_python = getattr(Options.options, 'disable_python', False)
- if conf.env.standalone_tdb:
- conf.find_program('xsltproc', var='XSLTPROC')
+ conf.CHECK_XSLTPROC_MANPAGES()
if not conf.env.disable_python:
# also disable if we don't have the python libs installed
diff --git a/source4/auth/credentials/tests/bindings.py b/source4/auth/credentials/tests/bindings.py
index 4cb059d..5ed61c6 100644
--- a/source4/auth/credentials/tests/bindings.py
+++ b/source4/auth/credentials/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/source4/auth/gensec/tests/bindings.py b/source4/auth/gensec/tests/bindings.py
index cffcc27..21e3fa3 100644
--- a/source4/auth/gensec/tests/bindings.py
+++ b/source4/auth/gensec/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2009
diff --git a/source4/auth/tests/bindings.py b/source4/auth/tests/bindings.py
index 58b66d3..cadfdd0 100644
--- a/source4/auth/tests/bindings.py
+++ b/source4/auth/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
index d797679..3324d4b 100755
--- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Andrew Tridgell 2009
diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
index aa428d1..59b6e55 100644
--- a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2005-2008
diff --git a/source4/lib/ldb/tests/python/dsdb_schema_info.py b/source4/lib/ldb/tests/python/dsdb_schema_info.py
index 4d136aa..7a3faba 100755
--- a/source4/lib/ldb/tests/python/dsdb_schema_info.py
+++ b/source4/lib/ldb/tests/python/dsdb_schema_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Unix SMB/CIFS implementation.
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 588b6fe..9de9a5b 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -46,7 +46,7 @@ def configure(conf):
conf.define('USING_SYSTEM_LDB', 1)
if conf.env.standalone_ldb:
- conf.find_program('xsltproc', var='XSLTPROC')
+ conf.CHECK_XSLTPROC_MANPAGES()
# we need this for the ldap backend
if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
diff --git a/source4/lib/policy/tests/python/bindings.py b/source4/lib/policy/tests/python/bindings.py
index 0d6a63b..b872d99 100644
--- a/source4/lib/policy/tests/python/bindings.py
+++ b/source4/lib/policy/tests/python/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2010
diff --git a/source4/librpc/rpc/dcerpc.py b/source4/librpc/rpc/dcerpc.py
index 1a76ecc..7ce423b 100644
--- a/source4/librpc/rpc/dcerpc.py
+++ b/source4/librpc/rpc/dcerpc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2008
diff --git a/source4/param/tests/bindings.py b/source4/param/tests/bindings.py
index 1e393ab..34d6544 100644
--- a/source4/param/tests/bindings.py
+++ b/source4/param/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/source4/script/depfilter.py b/source4/script/depfilter.py
index 74d1d17..440b560 100755
--- a/source4/script/depfilter.py
+++ b/source4/script/depfilter.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Filter out arcs in a dotty graph that are at or below a certain
# node. This is useful for visualising parts of the dependency graph.
diff --git a/source4/scripting/bin/testparm b/source4/scripting/bin/testparm
index 471d9e0..c30e461 100755
--- a/source4/scripting/bin/testparm
+++ b/source4/scripting/bin/testparm
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# vim: expandtab ft=python
#
# Unix SMB/CIFS implementation.
diff --git a/source4/scripting/python/examples/netbios.py b/source4/scripting/python/examples/netbios.py
index 3671076..a29b09f 100644
--- a/source4/scripting/python/examples/netbios.py
+++ b/source4/scripting/python/examples/netbios.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2008
diff --git a/source4/scripting/python/examples/samr.py b/source4/scripting/python/examples/samr.py
index c0e3167..9b8e31e 100755
--- a/source4/scripting/python/examples/samr.py
+++ b/source4/scripting/python/examples/samr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Unix SMB/CIFS implementation.
diff --git a/source4/scripting/python/examples/winreg.py b/source4/scripting/python/examples/winreg.py
index 80b48ec..484a69b 100755
--- a/source4/scripting/python/examples/winreg.py
+++ b/source4/scripting/python/examples/winreg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# tool to manipulate a remote registry
# Copyright Andrew Tridgell 2005
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 9899131..80873dc 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007-2008
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index a9196b4..29ab8f0 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Samba-specific bits for optparse
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/source4/scripting/python/samba/hostconfig.py b/source4/scripting/python/samba/hostconfig.py
index 313e342..6eee6cf 100644
--- a/source4/scripting/python/samba/hostconfig.py
+++ b/source4/scripting/python/samba/hostconfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2008
diff --git a/source4/scripting/python/samba/idmap.py b/source4/scripting/python/samba/idmap.py
index 1cb33fd..93fca46 100644
--- a/source4/scripting/python/samba/idmap.py
+++ b/source4/scripting/python/samba/idmap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) 2008 Kai Blin <kai at samba.org>
diff --git a/source4/scripting/python/samba/ms_display_specifiers.py b/source4/scripting/python/samba/ms_display_specifiers.py
index 2a54e4a..fd92b20 100644
--- a/source4/scripting/python/samba/ms_display_specifiers.py
+++ b/source4/scripting/python/samba/ms_display_specifiers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Create DisplaySpecifiers LDIF (as a string) from the documents provided by
# Microsoft under the WSPP.
diff --git a/source4/scripting/python/samba/ndr.py b/source4/scripting/python/samba/ndr.py
index e718ff3..c9ee684 100644
--- a/source4/scripting/python/samba/ndr.py
+++ b/source4/scripting/python/samba/ndr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Unix SMB/CIFS implementation.
diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index f51e21a..6fd7294 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2009
diff --git a/source4/scripting/python/samba/netcmd/domainlevel.py b/source4/scripting/python/samba/netcmd/domainlevel.py
index 7953ee6..60cd844 100644
--- a/source4/scripting/python/samba/netcmd/domainlevel.py
+++ b/source4/scripting/python/samba/netcmd/domainlevel.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Raises domain and forest function levels
#
diff --git a/source4/scripting/python/samba/netcmd/dsacl.py b/source4/scripting/python/samba/netcmd/dsacl.py
index 0149d37..2d74145 100644
--- a/source4/scripting/python/samba/netcmd/dsacl.py
+++ b/source4/scripting/python/samba/netcmd/dsacl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Manipulate ACLs on directory objects
#
diff --git a/source4/scripting/python/samba/netcmd/enableaccount.py b/source4/scripting/python/samba/netcmd/enableaccount.py
index 3849f60..d89cbbd 100644
--- a/source4/scripting/python/samba/netcmd/enableaccount.py
+++ b/source4/scripting/python/samba/netcmd/enableaccount.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Enables an user account on a Samba4 server
# Copyright Jelmer Vernooij 2008
diff --git a/source4/scripting/python/samba/netcmd/export.py b/source4/scripting/python/samba/netcmd/export.py
index 08fa4bf..5edb318 100644
--- a/source4/scripting/python/samba/netcmd/export.py
+++ b/source4/scripting/python/samba/netcmd/export.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Export keytab
#
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py
index 6b421fa..da7a382 100644
--- a/source4/scripting/python/samba/netcmd/fsmo.py
+++ b/source4/scripting/python/samba/netcmd/fsmo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Changes a FSMO role owner
#
diff --git a/source4/scripting/python/samba/netcmd/group.py b/source4/scripting/python/samba/netcmd/group.py
index 41506bb..3a467fb 100644
--- a/source4/scripting/python/samba/netcmd/group.py
+++ b/source4/scripting/python/samba/netcmd/group.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Adds a new user to a Samba4 server
# Copyright Jelmer Vernooij 2008
diff --git a/source4/scripting/python/samba/netcmd/join.py b/source4/scripting/python/samba/netcmd/join.py
index 8438f75..90bb077 100644
--- a/source4/scripting/python/samba/netcmd/join.py
+++ b/source4/scripting/python/samba/netcmd/join.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# joins
#
diff --git a/source4/scripting/python/samba/netcmd/machinepw.py b/source4/scripting/python/samba/netcmd/machinepw.py
index f156f97..9951dd7 100644
--- a/source4/scripting/python/samba/netcmd/machinepw.py
+++ b/source4/scripting/python/samba/netcmd/machinepw.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Machine passwords
# Copyright Jelmer Vernooij 2010
diff --git a/source4/scripting/python/samba/netcmd/netacl.py b/source4/scripting/python/samba/netcmd/netacl.py
index 41764a5..3f68ee7 100644
--- a/source4/scripting/python/samba/netcmd/netacl.py
+++ b/source4/scripting/python/samba/netcmd/netacl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Manipulate ACLs
#
diff --git a/source4/scripting/python/samba/netcmd/newuser.py b/source4/scripting/python/samba/netcmd/newuser.py
index 982b75f..693568d 100644
--- a/source4/scripting/python/samba/netcmd/newuser.py
+++ b/source4/scripting/python/samba/netcmd/newuser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Adds a new user to a Samba4 server
# Copyright Jelmer Vernooij 2008
diff --git a/source4/scripting/python/samba/netcmd/ntacl.py b/source4/scripting/python/samba/netcmd/ntacl.py
index ea6bcb6..8365658 100644
--- a/source4/scripting/python/samba/netcmd/ntacl.py
+++ b/source4/scripting/python/samba/netcmd/ntacl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Manipulate file NT ACLs
#
diff --git a/source4/scripting/python/samba/netcmd/pwsettings.py b/source4/scripting/python/samba/netcmd/pwsettings.py
index 3030248..f4f8270 100644
--- a/source4/scripting/python/samba/netcmd/pwsettings.py
+++ b/source4/scripting/python/samba/netcmd/pwsettings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Sets password settings.
# (Password complexity, history length, minimum password length, the minimum
diff --git a/source4/scripting/python/samba/netcmd/setexpiry.py b/source4/scripting/python/samba/netcmd/setexpiry.py
index c424c08..bd8ea16 100644
--- a/source4/scripting/python/samba/netcmd/setexpiry.py
+++ b/source4/scripting/python/samba/netcmd/setexpiry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Sets the user password expiry on a Samba4 server
# Copyright Jelmer Vernooij 2008
diff --git a/source4/scripting/python/samba/netcmd/setpassword.py b/source4/scripting/python/samba/netcmd/setpassword.py
index d51e8ea..d4451d4 100644
--- a/source4/scripting/python/samba/netcmd/setpassword.py
+++ b/source4/scripting/python/samba/netcmd/setpassword.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Sets a user password on a Samba4 server
# Copyright Jelmer Vernooij 2008
diff --git a/source4/scripting/python/samba/netcmd/time.py b/source4/scripting/python/samba/netcmd/time.py
index 710f4b6..0286f9d 100644
--- a/source4/scripting/python/samba/netcmd/time.py
+++ b/source4/scripting/python/samba/netcmd/time.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# time
#
diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index bf63b49..aac7798 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# user management
#
diff --git a/source4/scripting/python/samba/netcmd/vampire.py b/source4/scripting/python/samba/netcmd/vampire.py
index ffcfbce..0bc8fcb 100644
--- a/source4/scripting/python/samba/netcmd/vampire.py
--
Samba Shared Repository
More information about the samba-cvs
mailing list