Updates from Samba HEAD:

 - Fix segfaults in the 'net ads' commands when no password is provided
 - Readd --with-ldapsam for 2.2 compatability.  This conditionally compiles the
   old options, but the actual code is available on all ldap systems.
 - Fix shadow passwords (as per work with vl)
 - Fix sending plaintext passwords to unicode servers (again vl)
 - Add a bit of const to secrets.c functions
 - Fix some spelling and grammer by vance.
 - Document the -r option in smbgroupedit.

There are more changes in HEAD, I'm only merging the changes I've been involved
with.

Andrew Bartlett
(This used to be commit 83973c389355a5cc9ca74af467dfd8b5dabd2c8f)

1 files changed, 14 insertions, 5 deletions

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 8b8278b053..11f73a1387 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -309,15 +309,24 @@ static int rpc_join_usage(int argc, const char **argv)
  * Main 'net_rpc_join()' (where the admain username/password is used) is 
  * in net_rpc_join.c
  * Assume if a -U is specified, it's the new style, otherwise it's the
- * old style
+ * old style.  If 'oldstyle' is specfied explicity, do it and don't prompt.
  **/
 
 int net_rpc_join(int argc, const char **argv) 
 {
-	if ((net_rpc_join_oldstyle(argc, argv) == 0))
-		return 0;
-	
-	return net_rpc_join_newstyle(argc, argv);
+	struct functable func[] = {
+		{"oldstyle", net_rpc_join_oldstyle},
+		{NULL, NULL}
+	};
+
+	if (argc == 0) {
+		if ((net_rpc_join_oldstyle(argc, argv) == 0))
+			return 0;
+		
+		return net_rpc_join_newstyle(argc, argv);
+	}
+
+	return net_run_function(argc, argv, func, rpc_join_usage);
 }