s3:lib: s/SMBkeepalive/NBSSkeepalive

[sfrench/samba-autobuild/.git] / source3 / lib / util_sock.c

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 867646bc5038f86410500b4dae39c1391639c8cc..ebdd2c78f3de696e0a794ec8f1aa320b2593e914 100644 (file)
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -47,26 +47,6 @@ int client_socket_port(int fd)
 }
 #endif
 
-/****************************************************************************
- Accessor functions to make thread-safe code easier later...
-****************************************************************************/
-
-void set_smb_read_error(enum smb_read_errors *pre,
-                       enum smb_read_errors newerr)
-{
-       if (pre) {
-               *pre = newerr;
-       }
-}
-
-void cond_set_smb_read_error(enum smb_read_errors *pre,
-                       enum smb_read_errors newerr)
-{
-       if (pre && *pre == SMB_READ_OK) {
-               *pre = newerr;
-       }
-}
-
 /****************************************************************************
  Determine if a file descriptor is in fact a socket.
 ****************************************************************************/
@@ -320,7 +300,7 @@ bool send_keepalive(int client)
 {
        unsigned char buf[4];
 
-       buf[0] = SMBkeepalive;
+       buf[0] = NBSSkeepalive;
        buf[1] = buf[2] = buf[3] = 0;
 
        return(write_data(client,(char *)buf,4) == 4);
@@ -350,7 +330,7 @@ NTSTATUS read_smb_length_return_keepalive(int fd, char *inbuf,
        *len = smb_len(inbuf);
        msg_type = CVAL(inbuf,0);
 
-       if (msg_type == SMBkeepalive) {
+       if (msg_type == NBSSkeepalive) {
                DEBUG(5,("Got keepalive packet\n"));
        }