[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  710aa77... socket-wrapper: not all systems have FIONREAD defined
      from  c1ccbfb... s3: Add wbinfo --logoff

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 710aa773d54509de34404f9992c5058ddfa45f3b
Author: Andrew Tridgell <tri...@samba.org>
Date:   Sat Apr 3 13:30:05 2010 +1100

    socket-wrapper: not all systems have FIONREAD defined
    
    tru64 for example

-----------------------------------------------------------------------

Summary of changes:
 lib/socket_wrapper/socket_wrapper.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/socket_wrapper/socket_wrapper.c 
b/lib/socket_wrapper/socket_wrapper.c
index 9d732ee..c7530c9 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -2002,6 +2002,7 @@ _PUBLIC_ int swrap_ioctl(int s, int r, void *p)
 
        ret = real_ioctl(s, r, p);
 
+#ifdef FIONREAD
        switch (r) {
        case FIONREAD:
                value = *((int *)p);
@@ -2012,6 +2013,7 @@ _PUBLIC_ int swrap_ioctl(int s, int r, void *p)
                }
                break;
        }
+#endif
 
        return ret;
 }


-- 
Samba Shared Repository