From 6814e946e0afed20a6ef0f45a9bcbfeda2e77706 Mon Sep 17 00:00:00 2001
From: Christian Beier <dontmind@freeshell.org>
Date: Sat, 2 Sep 2017 18:05:46 +0200
Subject: [PATCH] libvncclient: rename rfbsasl.[c|h] to sasl.[c|h] to be in
 line with naming of other files

---
 CMakeLists.txt                     | 2 +-
 libvncclient/rfbproto.c            | 2 +-
 libvncclient/{rfbsasl.c => sasl.c} | 4 ++--
 libvncclient/{rfbsasl.h => sasl.h} | 6 +++---
 libvncclient/sockets.c             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename libvncclient/{rfbsasl.c => sasl.c} (99%)
 rename libvncclient/{rfbsasl.h => sasl.h} (94%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 430e909..f605202 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,7 +338,7 @@ endif()
 if(LIBVNCSERVER_HAVE_SASL)
   set(LIBVNCCLIENT_SOURCES
     ${LIBVNCCLIENT_SOURCES}
-    ${LIBVNCCLIENT_DIR}/rfbsasl.c
+    ${LIBVNCCLIENT_DIR}/sasl.c
   )
 endif()
 
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index 572af9d..df8b6d0 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -66,7 +66,7 @@
 #include <gcrypt.h>
 #endif
 
-#include "rfbsasl.h"
+#include "sasl.h"
 #include "minilzo.h"
 #include "tls.h"
 
diff --git a/libvncclient/rfbsasl.c b/libvncclient/sasl.c
similarity index 99%
rename from libvncclient/rfbsasl.c
rename to libvncclient/sasl.c
index dc7d3bc..0530307 100644
--- a/libvncclient/rfbsasl.c
+++ b/libvncclient/sasl.c
@@ -26,7 +26,7 @@
  */
 
 /*
- * rfbsasl.c - functions to deal with client side of the SASL protocol.
+ * sasl.c - functions to deal with client side of the SASL protocol.
  */
 
 #ifdef __STRICT_ANSI__
@@ -54,7 +54,7 @@
 #include <arpa/inet.h>
 #endif /* WIN32 */
 
-#include "rfbsasl.h"
+#include "sasl.h"
 
 #include "tls.h"
 
diff --git a/libvncclient/rfbsasl.h b/libvncclient/sasl.h
similarity index 94%
rename from libvncclient/rfbsasl.h
rename to libvncclient/sasl.h
index 2936364..5a52149 100644
--- a/libvncclient/rfbsasl.h
+++ b/libvncclient/sasl.h
@@ -1,5 +1,5 @@
-#ifndef RFBSASL_H
-#define RFBSASL_H
+#ifndef SASL_H
+#define SASL_H
 
 /*
  *  Copyright (C) 2017 S. Waterman.  All Rights Reserved.
@@ -36,4 +36,4 @@ int ReadFromSASL(rfbClient* client, char *out, unsigned int n);
 
 #endif  /* LIBVNCSERVER_HAVE_SASL */
 
-#endif /* RFBSASL_H */
+#endif /* SASL_H */
diff --git a/libvncclient/sockets.c b/libvncclient/sockets.c
index 2d505c7..ed2deef 100644
--- a/libvncclient/sockets.c
+++ b/libvncclient/sockets.c
@@ -58,7 +58,7 @@
 #include <netdb.h>
 #endif
 #include "tls.h"
-#include "rfbsasl.h"
+#include "sasl.h"
 
 #ifdef _MSC_VER
 #  define snprintf _snprintf