Changeset 879 for trunk/server

Timestamp:

May 8, 2015, 7:01:59 PM (10 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.6: small change for the ndpsmb client

Location:

trunk/server/source3

Files:

• include/client.h (modified) (1 diff)
• libsmb/clilist.c (modified) (8 diffs)
• libsmb/libsmb_dir.c (modified) (1 diff)

trunk/server/source3/include/client.h

@@ -160 +160 @@
         struct timespec atime_ts;
         struct timespec ctime_ts;
+#ifdef __OS2__
+        int easize;
+#endif
         char *name;
         char short_name[13*3]; /* the *3 is to cope with multi-byte */

trunk/server/source3/libsmb/clilist.c

@@ -28 +28 @@
 ****************************************************************************/
 
+#ifndef __OS2__
 static size_t calc_next_entry_offset(const char *base, const char *pdata_end)
+#else
+size_t calc_next_entry_offset(const char *base, const char *pdata_end)
+#endif
 {
         size_t next_entry_offset = (size_t)IVAL(base,0);
@@ -88 +92 @@
                         p += 27;
                         p += align_string(base_ptr, p, 0);
+#ifdef __OS2__
+                        finfo->easize = -1;
+#endif
 
                         /* We can safely use len here (which is required by OS/2)
@@ -134 +141 @@
                         finfo->size = IVAL(p,16);
                         finfo->mode = CVAL(p,24);
+#ifdef __OS2__
+                        finfo->easize = IVAL(p,26);
+#endif
                         len = CVAL(p, 30);
                         p += 31;
@@ -183 +193 @@
                         namelen = IVAL(p,0);
                         p += 4;
+#ifdef __OS2__
+                        finfo->easize = IVAL(p,0);
+#endif
                         p += 4; /* EA size */
                         slen = SVAL(p, 0);
@@ -190 +203 @@
                         }
                         p += 2;
+#ifndef __OS2__
                         {
                                 /* stupid NT bugs. grr */
@@ -198 +212 @@
                                             slen, flags);
                         }
+#endif
                         p += 24; /* short name? */
                         if (p + namelen < p || p + namelen > pdata_end) {
@@ -218 +233 @@
                            copy it here. */
 
+#ifndef __OS2__
                         if (p_last_name_raw) {
                                 *p_last_name_raw = data_blob(NULL, namelen+2);
@@ -223 +239 @@
                                 SSVAL(p_last_name_raw->data, namelen, 0);
                         }
+#endif
                         return calc_next_entry_offset(base, pdata_end);
                 }

trunk/server/source3/libsmb/libsmb_dir.c

@@ -254 +254 @@
 }
 
+#ifndef __OS2__
 static int
+#else
+int
+#endif
 net_share_enum_rpc(struct cli_state *cli,
                    void (*fn)(const char *name,