]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vlv: better syntax for parsing greater than or equal strings
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 23 Dec 2015 04:34:15 +0000 (17:34 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 9 Mar 2016 09:32:16 +0000 (10:32 +0100)
This makes the gt_eq case different from the indexed case in the eyes
of sscanf().

Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
lib/ldb/common/ldb_controls.c

index 8d7b430d4a8f547ee7a42162c541fd90473a4ad6..c76054031cd42b5bafb974c0f4847628046013f6 100644 (file)
@@ -464,7 +464,7 @@ struct ldb_control *ldb_parse_control_from_string(struct ldb_context *ldb, TALLO
                p = &(control_strings[sizeof(LDB_CONTROL_VLV_REQ_NAME)]);
                ret = sscanf(p, "%d:%d:%d:%d:%d:%1023[^$]", &crit, &bc, &ac, &os, &cc, ctxid);
                if (ret < 5) {
-                       ret = sscanf(p, "%d:%d:%d:%1023[^:]:%1023[^$]", &crit, &bc, &ac, attr, ctxid);
+                       ret = sscanf(p, "%d:%d:%d:>=%1023[^:]:%1023[^$]", &crit, &bc, &ac, attr, ctxid);
                }
                        
                if ((ret < 4) || (crit < 0) || (crit > 1)) {