sync with 2.2 branch

(This used to be commit d72d0972bd)

packaging/SGI/smb.conf

@@ -93,6 +93,17 @@
 ;  Printer admin account to allow uploading printer drivers
    printer admin = lp
 
+;  Sample winbindd configuration parameters - uncomment and
+;  change if necessary for your desired configuration
+;   winbind uid = 50000-60000
+;   winbind gid = 50000-60000
+;   winbind separator = +
+;   winbind cache time = 10
+;   password server = *
+
+;  Sample add user command for automatically adding machine accounts
+;   add user script = /usr/sbin/passmgmt -a -h/dev/null -g20 -s/usr/bin/false %u
+
 [homes]
    comment = Home Directories
    browseable = no