summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-10-26 14:27:46 +0000
committerLuke Leighton <lkcl@samba.org>1999-10-26 14:27:46 +0000
commit9d890f269cf54291edee585168960a56731cb363 (patch)
treeb85a37834f72212c64c3babdeea967a397a0e605
parent56128244261f8e4c6e1144da66c736fbc2104665 (diff)
downloadsamba-9d890f269cf54291edee585168960a56731cb363.tar.gz
samba-9d890f269cf54291edee585168960a56731cb363.tar.bz2
samba-9d890f269cf54291edee585168960a56731cb363.zip
cut/paste code from smbclient for wait_keyboard() function. oops.
(This used to be commit c25560ba43bd1b53d79456cbceab954aa3bb1dac)
-rw-r--r--source3/include/nterr.h7
-rw-r--r--source3/rpcclient/rpcclient.c8
2 files changed, 9 insertions, 6 deletions
diff --git a/source3/include/nterr.h b/source3/include/nterr.h
index 57d67527ba..21e245d287 100644
--- a/source3/include/nterr.h
+++ b/source3/include/nterr.h
@@ -1,3 +1,8 @@
+/* Win32 Status codes. */
+
+#define STATUS_BUFFER_OVERFLOW (5)
+#define STATUS_MORE_ENTRIES (0x105)
+
/* these are the NT error codes less than 1000. They are here for when
we start supporting NT error codes in Samba. They were extracted
using a loop in smbclient then printing a netmon sniff to a file */
@@ -7,7 +12,6 @@
#define NT_STATUS_INVALID_INFO_CLASS (3)
#define NT_STATUS_INFO_LENGTH_MISMATCH (4)
#define NT_STATUS_ACCESS_VIOLATION (5)
-#define STATUS_BUFFER_OVERFLOW (5)
#define NT_STATUS_IN_PAGE_ERROR (6)
#define NT_STATUS_PAGEFILE_QUOTA (7)
#define NT_STATUS_INVALID_HANDLE (8)
@@ -505,5 +509,4 @@
#define NT_STATUS_QUOTA_LIST_INCONSISTENT (614)
#define NT_STATUS_FILE_IS_OFFLINE (615)
#define NT_STATUS_NOTIFY_ENUM_DIR (0x10C)
-#define STATUS_MORE_ENTRIES (0x105)
#define NT_STATUS_NO_SUCH_JOB (0xEDE) /* scheduler */
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 9c6c99927f..ec9fe33b58 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -268,12 +268,12 @@ static void wait_keyboard(void)
while (1) {
FD_ZERO(&fds);
- FD_SET(cli->fd,&fds);
+ FD_SET(smb_cli->fd,&fds);
FD_SET(fileno(stdin),&fds);
timeout.tv_sec = 20;
timeout.tv_usec = 0;
- sys_select(MAX(cli->fd,fileno(stdin))+1,&fds,&timeout);
+ sys_select(MAX(smb_cli->fd,fileno(stdin))+1,&fds,&timeout);
if (FD_ISSET(fileno(stdin),&fds))
return;
@@ -282,8 +282,8 @@ static void wait_keyboard(void)
client_receive_smb as we want to receive
session keepalives and then drop them here.
*/
- if (FD_ISSET(cli->fd,&fds))
- receive_smb(cli->fd,cli->inbuf,0);
+ if (FD_ISSET(smb_cli->fd,&fds))
+ receive_smb(smb_cli->fd,smb_cli->inbuf,0);
}
}
#endif