Changeset 110 for branches/samba-3.0/source/ndpsmb/smbwrp.c

Timestamp:

Jan 21, 2008, 9:55:43 AM (18 years ago)

Author:

Paul Smedley

Message:

Check in updated detection of kerberos support

File:

• branches/samba-3.0/source/ndpsmb/smbwrp.c (modified) (10 diffs)

branches/samba-3.0/source/ndpsmb/smbwrp.c

@@ -1027 +1027 @@
         if (!finfo) finfo = &finfo1;
 
-//      memcpy(finfo,&def_finfo,sizeof(*finfo));
         finfo->attr = def_finfo.mode;
         finfo->mtime = def_finfo.mtime_ts.tv_sec;
@@ -1162 +1161 @@
         smbwrp_fileinfo finfo;
         int i;
-        char *tdl, *dirlist = NULL;
+        char *dirlist = NULL;
         int dirlist_len = 0;
         int total_received = -1;
@@ -1168 +1167 @@
         int ff_searchcount=0;
         int ff_eos=0;
-        //int ff_lastname=0;
         int ff_dir_handle=0;
         int loop_count = 0;
@@ -1181 +1179 @@
 
         /* NT uses 260, OS/2 uses 2. Both accept 1. */
-        info_level = (cli->capabilities&CAP_NT_SMBS)?260:2;
+        info_level = (cli->capabilities&CAP_NT_SMBS)?260:2; 
 
         debuglocal(4,"list_files level %d. mask <%s>\n", info_level, mask);
@@ -1204 +1202 @@
                         SSVAL(param,0,attribute); /* attribute */
                         SSVAL(param,2,max_matches); /* max count */
-                        //SSVAL(param,4,4+2);   /* resume required + close on end */
                         SSVAL(param,4,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END)); /* resume required + close on end */
                         SSVAL(param,6,info_level); 
@@ -1215 +1212 @@
                         SSVAL(param,0,ff_dir_handle);
                         SSVAL(param,2,max_matches); /* max count */
-                        //SIVAL(param,6,0); /* ff_resume_key */
                         SSVAL(param,4,info_level); 
                         /* For W2K servers serving out FAT filesystems we *must* set the
@@ -1223 +1219 @@
                            can miss filenames. Use last filename continue instead. JRA */
                         SSVAL(param,10,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END));        /* resume required + close on end */
-                        //SSVAL(param,10,8+4+2);        /* continue + resume required + close on end */
                         p = param+12;
-                        //p += clistr_push(cli, param+12, mask, sizeof(param)-12, 
-                        //               STR_TERMINATE);
                         if (last_name_raw_len && (last_name_raw_len < (sizeof(param)-12))) {
                                 memcpy(p, last_name_raw.data, last_name_raw_len);
@@ -1236 +1229 @@
 
                 param_len = PTR_DIFF(p, param);
+
                 if (!cli_send_trans(cli, SMBtrans2, 
                                     NULL,                   /* Name */
@@ -1271 +1265 @@
                 }
 
-
                 if (cli_is_error(cli) || !rdata || !rparam) 
                 {
@@ -1295 +1288 @@
                         ff_searchcount = SVAL(p,2);
                         ff_eos = SVAL(p,4);
-                        //ff_lastname = SVAL(p,8);
                 } else {
                         ff_searchcount = SVAL(p,0);
                         ff_eos = SVAL(p,2);
-                        //ff_lastname = SVAL(p,6);
                 }
                 debuglocal(4,"list_files %d %d %d %d\n", ff_searchcount, ff_eos, "(ff_lastname)", First);