svn commit: samba r20460 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .

[abartlet]

Author: abartlet
Date: 2007-01-02 03:40:29 +0000 (Tue, 02 Jan 2007)
New Revision: 20460

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20460

Log:
Simplfy the handling of password hashes in the samba3sam module.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c        
2007-01-02 03:39:01 UTC (rev 20459)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c        
2007-01-02 03:40:29 UTC (rev 20460)
@@ -246,15 +246,11 @@
 {
        struct ldb_val out;
        struct samr_Password *pwd;
-       pwd = smbpasswd_gethexpwd(ctx, talloc_strndup(ctx, (const char 
*)val->data, val->length));
+       pwd = smbpasswd_gethexpwd(ctx, (const char *)val->data);
        if (!pwd) {
                return data_blob(NULL, 0);
        }
-       out.data = talloc_memdup(ctx, pwd->hash, sizeof(pwd->hash));
-       if (!out.data) {
-               return data_blob(NULL, 0);
-       }
-       out.length = sizeof(pwd->hash);
+       out = data_blob_talloc(ctx, pwd->hash, sizeof(pwd->hash));
        return out;
 }
 
@@ -331,7 +327,7 @@
 
        /* sambaLMPassword -> lmPwdHash*/
        {
-               .local_name = "lmpwdhash",
+               .local_name = "lmPwdHash",
                .type = MAP_CONVERT,
                .u = {
                        .convert = {