r22492: Add objectid code.

Jeremy.

diff --git a/source/include/ntioctl.h b/source/include/ntioctl.h
index 1dbde54277cfed404470f7400fbad89e0a842b2b..b4b8169a51777fc1d989c79eff72dbdfaf5b1e9c 100644 (file)
--- a/source/include/ntioctl.h
+++ b/source/include/ntioctl.h
@@ -47,7 +47,7 @@
 #define FSCTL_SET_REPARSE_POINT      0x000900A4
 #define FSCTL_GET_REPARSE_POINT      0x000900A8
 #define FSCTL_DELETE_REPARSE_POINT   0x000900AC
-#define FSCTL_0x000900C0            0x000900C0
+#define FSCTL_CREATE_OR_GET_OBJECT_ID 0x000900C0
 #define FSCTL_SET_SPARSE             0x000900C4
 #define FSCTL_SET_ZERO_DATA          0x000900C8
 #define FSCTL_SET_ENCRYPTION         0x000900D7

diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index fa9828ae03a1917309cd7d4a5afcaa2b53e59adf..1a4b43ce51f3010fc6e8cbecca3071a98719c5e3 100644 (file)
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -2285,15 +2285,30 @@ static int call_nt_transact_ioctl(connection_struct *conn, char *inbuf, char *ou
                                0);
                return -1;
        
-       case FSCTL_0x000900C0:
-               /* pretend this succeeded - don't know what this really is
-                  but works ok like this --metze
+       case FSCTL_CREATE_OR_GET_OBJECT_ID:
+       {
+               unsigned char objid[16];
+
+               /* This should return the object-id on this file.
+                * I think I'll make this be the inode+dev. JRA.
                 */
 
-               DEBUG(10,("FSCTL_0x000900C0: called on FID[0x%04X](but not implemented)\n",fidnum));
-               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, NULL,
-                               0);
+               DEBUG(10,("FSCTL_CREATE_OR_GET_OBJECT_ID: called on FID[0x%04X]\n",fidnum));
+
+               data_count = 64;
+               pdata = nttrans_realloc(ppdata, data_count);
+               if (pdata == NULL) {
+                       return ERROR_NT(NT_STATUS_NO_MEMORY);
+               }
+               SINO_T_VAL(pdata,0,fsp->inode);
+               SDEV_T_VAL(pdata,8,fsp->dev);
+               memcpy(pdata+16,create_volume_objectid(conn,objid),16);
+               SINO_T_VAL(pdata,32,fsp->inode);
+               SDEV_T_VAL(pdata,40,fsp->dev);
+               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, pdata, data_count);
                return -1;
+       }
+
 
        case FSCTL_GET_REPARSE_POINT:
                /* pretend this fail - my winXP does it like this
@@ -2301,8 +2316,7 @@ static int call_nt_transact_ioctl(connection_struct *conn, char *inbuf, char *ou
                 */
 
                DEBUG(10,("FSCTL_GET_REPARSE_POINT: called on FID[0x%04X](but not implemented)\n",fidnum));
-               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_NOT_A_REPARSE_POINT,
-                               NULL, 0, NULL, 0);
+               return ERROR_NT(NT_STATUS_NOT_A_REPARSE_POINT);
                return -1;
 
        case FSCTL_SET_REPARSE_POINT:
@@ -2311,8 +2325,7 @@ static int call_nt_transact_ioctl(connection_struct *conn, char *inbuf, char *ou
                 */
 
                DEBUG(10,("FSCTL_SET_REPARSE_POINT: called on FID[0x%04X](but not implemented)\n",fidnum));
-               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_NOT_A_REPARSE_POINT,
-                               NULL, 0, NULL, 0);
+               return ERROR_NT(NT_STATUS_NOT_A_REPARSE_POINT);
                return -1;
                        
        case FSCTL_GET_SHADOW_COPY_DATA: /* don't know if this name is right...*/