From 998b0fef1199b3c24939878d202f5e4b71e5b742 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 19 May 2008 23:06:42 +0200
Subject: Add "mymachinepw" to fetch our machine password out of secrets.ldb
 (This used to be commit 4fbe16deb0e06e145f643568a699b80b431d4f42)

---
 source4/scripting/bin/mymachinepw | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100755 source4/scripting/bin/mymachinepw

(limited to 'source4/scripting/bin')

diff --git a/source4/scripting/bin/mymachinepw b/source4/scripting/bin/mymachinepw
new file mode 100755
index 0000000000..d489dc4693
--- /dev/null
+++ b/source4/scripting/bin/mymachinepw
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Volker Lendecke 2008
+#
+# Extract our own machine pw from secrets.ldb
+#
+# 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/>.
+#
+
+import samba.param as param, ldb, sys, getopt
+
+optlist, args = getopt.getopt(sys.argv[1:], "s:")
+
+conf = param.LoadParm()
+loaded = False
+
+for o, v in optlist:
+    if o == "-s":
+        if not conf.load(v):
+            raise(v + " not found")
+        loaded = True
+
+if not loaded:
+    conf.load_default()
+
+secrets = ldb.Ldb()
+secrets.connect(conf.get("private dir") + "/secrets.ldb")
+
+search = "(&(objectclass=primaryDomain)(samaccountname=" + \
+	conf.get("netbios name") + "$))"
+
+msg = secrets.search(expression=search, attrs=['secret'])
+print(msg[0]['secret'][0])
-- 
cgit 


From 934cfb98809ff0200170ab1fc206af1312226cb0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 26 Jul 2008 20:38:20 +0200
Subject: mamachinepw: add better error handling

metze
(This used to be commit 7ac424137f62ceacf44e477f4e3805267013005b)
---
 source4/scripting/bin/mymachinepw | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'source4/scripting/bin')

diff --git a/source4/scripting/bin/mymachinepw b/source4/scripting/bin/mymachinepw
index d489dc4693..49a4245a3a 100755
--- a/source4/scripting/bin/mymachinepw
+++ b/source4/scripting/bin/mymachinepw
@@ -2,6 +2,7 @@
 
 # Unix SMB/CIFS implementation.
 # Copyright (C) Volker Lendecke 2008
+# Copyright (C) Stefan Metzmacher 2008
 #
 # Extract our own machine pw from secrets.ldb
 #
@@ -29,17 +30,32 @@ loaded = False
 for o, v in optlist:
     if o == "-s":
         if not conf.load(v):
-            raise(v + " not found")
+            print(v + " not found")
+            exit(1)
         loaded = True
 
 if not loaded:
     conf.load_default()
 
+path=conf.get("private dir") + "/secrets.ldb"
+netbios=conf.get("netbios name")
+
 secrets = ldb.Ldb()
-secrets.connect(conf.get("private dir") + "/secrets.ldb")
+secrets.connect(path)
 
 search = "(&(objectclass=primaryDomain)(samaccountname=" + \
-	conf.get("netbios name") + "$))"
+	  netbios + "$))"
 
 msg = secrets.search(expression=search, attrs=['secret'])
-print(msg[0]['secret'][0])
+
+if not msg:
+    error =  "Error:\n"
+    error += "Password for host[" + netbios + "] not found in path[" + path + "].\n"
+    error += "You may want to pass the smb.conf location via the -s option."
+    print error
+    exit(1)
+
+password=msg[0]['secret'][0];
+
+print(password)
+exit(0)
-- 
cgit