--- utils/smbpasswd.c.060115    2006-01-16 07:43:26.000000000 -0500
+++ utils/smbpasswd.c   2006-01-16 07:30:26.000000000 -0500
@@ -327,8 +327,15 @@
        char *old_passwd = NULL;
 
        if (local_flags & LOCAL_SET_LDAP_ADMIN_PW) {
+               char    *ldap_admin_dn;
+
+               ldap_admin_dn = lp_ldap_admin_dn();
+               if ( ! *ldap_admin_dn ) {
+                       DEBUG(0,("ERROR: 'ldap admin dn' not set in smb.conf!\n"));
+                       goto done;
+               }
                printf("Setting stored password for \"%s\" in secrets.tdb\n", 
-                       lp_ldap_admin_dn());
+                       ldap_admin_dn);
                if ( ! *ldap_secret ) {
                        new_passwd = prompt_for_new_password(stdin_passwd_get);
                        fstrcpy(ldap_secret, new_passwd);