diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-29 20:16:18 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-29 20:16:18 +1000 |
| commit | 617ef56aa3378c384026b72871af5a7253b8df33 (patch) | |
| tree | 2c1fa7f290f26f668207a5882b0d8ba05e483b4c | |
| parent | 5bc1d81a1df9d7de8d357c521edc9e3333e821a3 (diff) | |
| download | samba-617ef56aa3378c384026b72871af5a7253b8df33.tar.gz samba-617ef56aa3378c384026b72871af5a7253b8df33.tar.bz2 samba-617ef56aa3378c384026b72871af5a7253b8df33.zip | |
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
(This used to be commit 3b1f5d10360ed1b26980d748a7c9be6db5977bd3)
| -rw-r--r-- | source4/lib/ldb-samba/ldif_handlers.c | 2 | ||||
| -rw-r--r-- | source4/setup/prefixMap.txt | 68 |
2 files changed, 35 insertions, 35 deletions
diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c index 03acf8b3f3..1f718cc1c5 100644 --- a/source4/lib/ldb-samba/ldif_handlers.c +++ b/source4/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/source4/setup/prefixMap.txt b/source4/setup/prefixMap.txt index 34a913c990..8ba9b9531c 100644 --- a/source4/setup/prefixMap.txt +++ b/source4/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 |