s3: Remove header==NULL code from db_ctdb_marshall_record

[kai/samba.git] / source3 / include / msdfs.h

diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h
index ef9dd78afe967c49e52ddc76d42712d00a85d210..b3892291272ef06ef0451f358e693162b14377bf 100644 (file)
--- a/source3/include/msdfs.h
+++ b/source3/include/msdfs.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
 */
 
@@ -38,39 +37,31 @@
 #define MAX_REFERRAL_COUNT   256
 #define MAX_MSDFS_JUNCTIONS 256
 
-typedef struct _client_referral {
+struct client_dfs_referral {
        uint32 proximity;
        uint32 ttl;
-       pstring dfspath;
-} CLIENT_DFS_REFERRAL;
+       char *dfspath;
+};
 
 struct referral {
-       pstring alternate_path; /* contains the path referred */
+       char *alternate_path; /* contains the path referred */
        uint32 proximity;
        uint32 ttl; /* how long should client cache referral */
 };
 
 struct junction_map {
-       fstring service_name;
-       pstring volume_name;
-       pstring comment;
+       char *service_name;
+       char *volume_name;
+       const char *comment;
        int referral_count;
        struct referral* referral_list;
 };
 
 struct dfs_path {
-       fstring hostname;
-       fstring servicename;
-       pstring reqpath;
-       BOOL posix_path;
+       char *hostname;
+       char *servicename;
+       char *reqpath;
+       bool posix_path;
 };
 
-#define init_dfsroot(conn, inbuf, outbuf)                      \
-{ if (lp_msdfs_root(SNUM(conn)) && lp_host_msdfs()) {          \
-        DEBUG(2,("Serving %s as a Dfs root\n",                         \
-                lp_servicename(SNUM(conn)) ));                 \
-       SSVAL(outbuf, smb_vwv2, SMB_SHARE_IN_DFS                \
-             | SVAL(outbuf, smb_vwv2));                        \
-} }
-
 #endif /* _MSDFS_H */