Remove extra spaces on prefixMap input and output.

Metze requested that the format not include spaces, and the input parser
already expects this.

Andrew Bartlett

diff --git a/source/lib/ldb-samba/ldif_handlers.c b/source/lib/ldb-samba/ldif_handlers.c
index 03acf8b3f34749a56d4f94302910010f28ce4c8d..1f718cc1c5adaca06d305723c3b15be581cb84e2 100644 (file)
--- a/source/lib/ldb-samba/ldif_handlers.c
+++ b/source/lib/ldb-samba/ldif_handlers.c
@@ -497,7 +497,7 @@ static int ldif_write_prefixMap(struct ldb_context *ldb, void *mem_ctx,
                if (i > 0) {
                        string = talloc_asprintf_append(string, ";"); 
                }
-               string = talloc_asprintf_append(string, "%u: %s", 
+               string = talloc_asprintf_append(string, "%u:%s", 
                                                   blob->ctr.dsdb.mappings[i].id_prefix,
                                                   blob->ctr.dsdb.mappings[i].oid.oid);
                if (string == NULL) {

diff --git a/source/setup/prefixMap.txt b/source/setup/prefixMap.txt
index 34a913c990dc5019a250cc95c2f3402fc1c293ec..8ba9b9531c1122306aef74db032d4501fdbdfd27 100644 (file)
--- a/source/setup/prefixMap.txt
+++ b/source/setup/prefixMap.txt
@@ -1,34 +1,34 @@
-0: 2.5.4
-1: 2.5.6
-2: 1.2.840.113556.1.2
-3: 1.2.840.113556.1.3
-4: 2.16.840.1.101.2.2.1
-5: 2.16.840.1.101.2.2.3
-6: 2.16.840.1.101.2.1.5
-7: 2.16.840.1.101.2.1.4
-8: 2.5.5
-9: 1.2.840.113556.1.4
-10: 1.2.840.113556.1.5
-19: 0.9.2342.19200300.100
-20: 2.16.840.1.113730.3
-21: 0.9.2342.19200300.100.1
-22: 2.16.840.1.113730.3.1
-23: 1.2.840.113556.1.5.7000
-24: 2.5.21
-25: 2.5.18
-26: 2.5.20
-11: 1.2.840.113556.1.4.260
-12: 1.2.840.113556.1.5.56
-13: 1.2.840.113556.1.4.262
-14: 1.2.840.113556.1.5.57
-15: 1.2.840.113556.1.4.263
-16: 1.2.840.113556.1.5.58
-17: 1.2.840.113556.1.5.73
-18: 1.2.840.113556.1.4.305
-27: 1.3.6.1.4.1.1466.101.119
-28: 2.16.840.1.113730.3.2
-29: 1.3.6.1.4.1.250.1
-30: 1.2.840.113549.1.9
-31: 0.9.2342.19200300.100.4
-32: 1.3.6.1.4.1.7165.4.1
-33: 1.3.6.1.4.1.7165.4.2
+0:2.5.4
+1:2.5.6
+2:1.2.840.113556.1.2
+3:1.2.840.113556.1.3
+4:2.16.840.1.101.2.2.1
+5:2.16.840.1.101.2.2.3
+6:2.16.840.1.101.2.1.5
+7:2.16.840.1.101.2.1.4
+8:2.5.5
+9:1.2.840.113556.1.4
+10:1.2.840.113556.1.5
+19:0.9.2342.19200300.100
+20:2.16.840.1.113730.3
+21:0.9.2342.19200300.100.1
+22:2.16.840.1.113730.3.1
+23:1.2.840.113556.1.5.7000
+24:2.5.21
+25:2.5.18
+26:2.5.20
+11:1.2.840.113556.1.4.260
+12:1.2.840.113556.1.5.56
+13:1.2.840.113556.1.4.262
+14:1.2.840.113556.1.5.57
+15:1.2.840.113556.1.4.263
+16:1.2.840.113556.1.5.58
+17:1.2.840.113556.1.5.73
+18:1.2.840.113556.1.4.305
+27:1.3.6.1.4.1.1466.101.119
+28:2.16.840.1.113730.3.2
+29:1.3.6.1.4.1.250.1
+30:1.2.840.113549.1.9
+31:0.9.2342.19200300.100.4
+32:1.3.6.1.4.1.7165.4.1
+33:1.3.6.1.4.1.7165.4.2