registry: Slightly simplify tdb_data_is_cstr
authorVolker Lendecke <vl@samba.org>
Sun, 9 Nov 2014 12:50:53 +0000 (12:50 +0000)
committerJeremy Allison <jra@samba.org>
Thu, 13 Nov 2014 21:10:08 +0000 (22:10 +0100)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/registry/reg_backend_db.c

index 67beb6a8d37fe4ee76d12679335cf2ff4ba82e3b..44a3d9fd356437c4686df6c57cf0eac3f1b63ca0 100644 (file)
@@ -547,7 +547,7 @@ static bool tdb_data_is_cstr(TDB_DATA d) {
        if (tdb_data_is_empty(d) || (d.dptr[d.dsize-1] != '\0')) {
                return false;
        }
-       return strchr((char *)d.dptr, '\0') == (char *)&d.dptr[d.dsize-1];
+       return strlen((char *)d.dptr) == (d.dsize-1);
 }
 
 static bool upgrade_v2_to_v3_check_subkeylist(struct db_context *db,