Changeset 224 for branches/samba-3.3.x/source/include

Timestamp:

May 24, 2009, 7:55:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

Location:

branches/samba-3.3.x/source/include

Files:

• doserr.h (modified) (1 diff)
• proto.h (modified) (2 diffs)
• version.h (modified) (1 diff)

branches/samba-3.3.x/source/include/doserr.h

@@ -202 +202 @@
 #define WERR_SERVICE_ALREADY_RUNNING W_ERROR(1056)
 #define WERR_SERVICE_DISABLED W_ERROR(1058)
+#define WERR_SERVICE_MARKED_FOR_DELETE W_ERROR(1072)
+#define WERR_SERVICE_EXISTS W_ERROR(1073)
 #define WERR_SERVICE_NEVER_STARTED W_ERROR(1077)
+#define WERR_DUPLICATE_SERVICE_NAME W_ERROR(1078)
 #define WERR_NOT_FOUND W_ERROR(1168)
 #define WERR_INVALID_COMPUTER_NAME W_ERROR(1210)

branches/samba-3.3.x/source/include/proto.h

@@ -8374 +8374 @@
 /* The following definitions come from rpc_server/srv_samr_util.c  */
 
+void copy_id18_to_sam_passwd(struct samu *to,
+                             struct samr_UserInfo18 *from);
 void copy_id20_to_sam_passwd(struct samu *to,
                              struct samr_UserInfo20 *from);
@@ -8381 +8383 @@
 void copy_id23_to_sam_passwd(struct samu *to,
                              struct samr_UserInfo23 *from);
+void copy_id24_to_sam_passwd(struct samu *to,
+                             struct samr_UserInfo24 *from);
 void copy_id25_to_sam_passwd(struct samu *to,
                              struct samr_UserInfo25 *from);
+void copy_id26_to_sam_passwd(struct samu *to,
+                             struct samr_UserInfo26 *from);
 
 /* The following definitions come from rpc_server/srv_spoolss.c  */

branches/samba-3.3.x/source/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 3
-#define SAMBA_VERSION_RELEASE 3
-#define SAMBA_VERSION_OFFICIAL_STRING "3.3.3"
+#define SAMBA_VERSION_RELEASE 4
+#define SAMBA_VERSION_OFFICIAL_STRING "3.3.4"
 #define SAMBA_VERSION_STRING samba_version_string()