From Mathieu Parent:

Dissector for LDAP Content Synchronization Operation
(Modified in order to remove the unneeded oid_add_from_string's)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31218 f5534014-38df-0310-8fa8-9805f1628bb7

3 files changed, 63 insertions, 6 deletions

diff --git a/asn1/ldap/Lightweight-Directory-Access-Protocol-V3.asn b/asn1/ldap/Lightweight-Directory-Access-Protocol-V3.asn
index 1ff67723a0..05fd763dd8 100644
--- a/asn1/ldap/Lightweight-Directory-Access-Protocol-V3.asn
+++ b/asn1/ldap/Lightweight-Directory-Access-Protocol-V3.asn
@@ -445,6 +445,64 @@ CancelRequestValue ::= SEQUENCE {
   cancelID	  MessageID
 }
 
+-- RFC 4533
+
+--syncRequestOID OBJECT IDENTIFIER ::= 1.3.6.1.4.1.4203.1.9.1.1
+
+SyncRequestValue ::= SEQUENCE {
+  mode ENUMERATED {
+    -- 0 unused
+    refreshOnly       (1),
+    -- 2 reserved
+    refreshAndPersist (3)
+  },
+  cookie     OCTET STRING OPTIONAL, -- SyncCookie OPTIONAL
+  reloadHint BOOLEAN DEFAULT FALSE
+}
+
+--syncStateOID OBJECT IDENTIFIER ::= 1.3.6.1.4.1.4203.1.9.1.2
+
+SyncStateValue ::= SEQUENCE {
+  state ENUMERATED {
+    present (0),
+    add (1),
+    modify (2),
+    delete (3)
+  },
+  entryUUID SyncUUID,
+  cookie    OCTET STRING OPTIONAL -- SyncCookie OPTIONAL
+}
+
+--syncDoneOID OBJECT IDENTIFIER ::= 1.3.6.1.4.1.4203.1.9.1.3
+
+SyncDoneValue ::= SEQUENCE {
+  cookie          OCTET STRING OPTIONAL, -- SyncCookie OPTIONAL
+  refreshDeletes  BOOLEAN DEFAULT FALSE
+}
+
+--syncInfoOID OBJECT IDENTIFIER ::= 1.3.6.1.4.1.4203.1.9.1.4
+
+SyncInfoValue ::= CHOICE {
+  newcookie      [0] OCTET STRING, -- SyncCookie
+  refreshDelete  [1] SEQUENCE {
+    cookie         OCTET STRING OPTIONAL, -- SyncCookie OPTIONAL
+    refreshDone    BOOLEAN DEFAULT TRUE
+  },
+  refreshPresent [2] SEQUENCE {
+    cookie         OCTET STRING OPTIONAL, -- SyncCookie OPTIONAL
+    refreshDone    BOOLEAN DEFAULT TRUE
+  },
+  syncIdSet      [3] SEQUENCE {
+    cookie         OCTET STRING OPTIONAL, -- SyncCookie OPTIONAL
+    refreshDeletes BOOLEAN DEFAULT FALSE,
+    syncUUIDs      SET OF SyncUUID
+  }
+}
+
+SyncUUID ::= OCTET STRING(SIZE(16))
+
+-- SyncCookie ::= OCTET STRING
+
 --
 
 -- Draft RFC - Password Policy for LDAP Directories
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf
index 5e736b79de..f80ff3a238 100644
--- a/asn1/ldap/ldap.cnf
+++ b/asn1/ldap/ldap.cnf
@@ -38,6 +38,11 @@ ReplControlValue		B "1.2.840.113556.1.4.841" "replControlValue"
 PasswdModifyRequestValue	B "1.3.6.1.4.1.4203.1.11.1" "passwdModifyOID"
 #RFC 3909
 CancelRequestValue		B "1.3.6.1.1.8"		    "cancelRequestOID"
+#RFC 4533
+SyncRequestValue 		B "1.3.6.1.4.1.4203.1.9.1.1" "syncRequestOID"
+SyncStateValue			B "1.3.6.1.4.1.4203.1.9.1.2" "syncStateOID"
+SyncDoneValue			B "1.3.6.1.4.1.4203.1.9.1.3" "syncDoneOID"
+SyncInfoValue			B "1.3.6.1.4.1.4203.1.9.1.4" "syncInfoOID"
 # Draft RFC - Password Policy for LDAP Directories
 PasswordPolicyResponseValue	B "1.3.6.1.4.1.42.2.27.8.5.1"  "passwordPolicy"
 
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 9f209c9b97..28f1eaad55 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -2193,12 +2193,6 @@ proto_reg_handoff_ldap(void)
 	oid_add_from_string("LDAP_SERVER_SHUTDOWN_NOTIFY_OID","1.2.840.113556.1.4.1907");
 	oid_add_from_string("LDAP_SERVER_RANGE_RETRIEVAL_NOERR_OID","1.2.840.113556.1.4.1948");
 
-	/* RFC 4533 */
-	oid_add_from_string("LDAP_CONTROL_SYNC","1.3.6.1.4.1.4203.1.9.1.1");
-	oid_add_from_string("LDAP_CONTROL_SYNC_STATE","1.3.6.1.4.1.4203.1.9.1.2");
-	oid_add_from_string("LDAP_CONTROL_SYNC_DONE","1.3.6.1.4.1.4203.1.9.1.3");
-	oid_add_from_string("LDAP_SYNC_INFO","1.3.6.1.4.1.4203.1.9.1.4");
-
 	register_ldap_name_dissector("netlogon", dissect_NetLogon_PDU, proto_cldap);
 	register_ldap_name_dissector("objectGUID", dissect_ldap_guid, proto_ldap);
 	register_ldap_name_dissector("supportedControl", dissect_ldap_oid, proto_ldap);