diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-10-26 14:27:46 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-10-26 14:27:46 +0000 |
| commit | c25560ba43bd1b53d79456cbceab954aa3bb1dac (patch) | |
| tree | ffeb13ff9a5ab68fe780fa8997d418db78d22b0f /source | |
| parent | c8fd555179314baf1672a23db34dc8ad9f2d02bf (diff) | |
| download | samba-c25560ba43bd1b53d79456cbceab954aa3bb1dac.tar.gz samba-c25560ba43bd1b53d79456cbceab954aa3bb1dac.tar.xz samba-c25560ba43bd1b53d79456cbceab954aa3bb1dac.zip | |
cut/paste code from smbclient for wait_keyboard() function. oops.
Diffstat (limited to 'source')
| -rw-r--r-- | source/include/nterr.h | 7 | ||||
| -rw-r--r-- | source/rpcclient/rpcclient.c | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source/include/nterr.h b/source/include/nterr.h index 57d67527baa..21e245d287f 100644 --- a/source/include/nterr.h +++ b/source/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/source/rpcclient/rpcclient.c b/source/rpcclient/rpcclient.c index 9c6c99927f0..ec9fe33b58c 100644 --- a/source/rpcclient/rpcclient.c +++ b/source/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 |