This commit was manufactured by cvs2svn to create tagsamba-2.2.0alpha3

'release-2-2-0-alpha3'.

3 files changed, 0 insertions, 1205 deletions

diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h
deleted file mode 100644
index e1c8cf5c875..00000000000
--- a/source/include/libsmbclient.h
+++ /dev/null
@@ -1,787 +0,0 @@
-/*=====================================================================
-   Unix SMB/Netbios implementation.
-   Version 2.0
-   SMB client library API definitions
-   Copyright (C) Andrew Tridgell 1998
-   Copyright (C) Richard Sharpe 2000
-   Copyright (C) John Terpsra 2000
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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.
-=====================================================================*/
-
-#ifndef SMBCLIENT_H_INCLUDED
-#define SMBCLIENT_H_INCLUDED
-
-/*-------------------------------------------------------------------*/
-/* The following are special comments to instruct DOXYGEN (automated 
- * documentation tool:
-*/
-/** \defgroup structure Data Structures Type and Constants
-*   Data structures, types, and constants
-*/
-/** \defgroup file File Functions
-*   Functions used to access individual file contents
-*/
-/** \defgroup directory Directory Functions
-*   Functions used to access directory entries
-*/
-/** \defgroup attribute Attributes Functions
-*   Functions used to view or change file and directory attributes
-*/
-/** \defgroup print Print Functions
-*   Functions used to access printing functionality
-*/
-/** \defgroup attribute Miscellaneous Functions
-*   Functions that don't fit in to other categories
-*/
-/*-------------------------------------------------------------------*/   
-
-/* Make sure we have the following includes for now ... */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define SMBC_MAX_NAME       1023
-#define SMBC_WORKGROUP      1
-#define SMBC_SERVER         2
-#define SMBC_FILE_SHARE     3
-#define SMBC_PRINTER_SHARE  4
-#define SMBC_COMMS_SHARE    5
-#define SMBC_IPC_SHARE      6
-#define SMBC_DIR            7
-#define SMBC_FILE           8
-#define SMBC_LINK           9
-
-#define SMBC_FILE_MODE (S_IFREG | 0444)
-#define SMBC_DIR_MODE  (S_IFDIR | 0555)
-
-/**@ingroup structure
- * Structure that represents a directory entry.
- *
-*/
-struct smbc_dirent 
-{
-    /** Type of entity.
-    SMBC_WORKGROUP=1,
-    SMBC_SERVER=2, 
-    SMBC_FILE_SHARE=3,
-    SMBC_PRINTER_SHARE=4,
-    SMBC_COMMS_SHARE=5,
-    SMBC_IPC_SHARE=6,
-    SMBC_DIR=7,
-    SMBC_FILE=8,
-    SMBC_LINK=9,*/ 
-    uint smbc_type; 
-
-    /** Length of this smbc_dirent in bytes
-     */
-    uint dirlen;
-    /** The length of the comment string in bytes (includes null 
-     *  terminator)
-     */
-    uint commentlen;
-    /** Points to the null terminated comment string 
-     */
-    char *comment;
-    /** The length of the name string in bytes (includes null 
-     *  terminator)
-     */
-    uint namelen;
-    /** Points to the null terminated name string 
-     */
-    char name[1];
-};
-
-
-#ifndef _CLIENT_H
-typedef unsigned short uint16;
-
-/**@ingroup structure
- * Structure that represents a print job.
- *
- */
-struct print_job_info 
-{
-    /** numeric ID of the print job
-     */
-    uint16 id;
-    
-    /** represents print job priority (lower numbers mean higher priority)
-     */
-    uint16 priority;
-    
-    /** Size of the print job
-     */
-    size_t size;
-    
-    /** Name of the user that owns the print job
-     */
-    char user[128];
-  
-    /** Name of the print job. This will have no name if an anonymous print
-     *  file was opened. Ie smb://server/printer
-     */
-    char name[128];
-
-    /** Time the print job was spooled
-    */
-    time_t t;
-};
-#endif
-
-
-/**@ingroup structure
- * Authentication callback function type.
- * 
- * Type for the the authentication function called by the library to
- * obtain authentication credentals
- *
- * @param srv       Server being authenticated to
- *
- * @param shr       Share being authenticated to
- *
- * @param wg        Pointer to buffer containing a "hint" for the
- *                  workgroup to be authenticated.  Should be filled in
- *                  with the correct workgroup if the hint is wrong.
- * 
- * @param wglen     The size of the workgroup buffer in bytes
- *
- * @param un        Pointer to buffer containing a "hint" for the
- *                  user name to be use for authentication. Should be
- *                  filled in with the correct workgroup if the hint is
- *                  wrong.
- * 
- * @param unlen     The size of the username buffer in bytes
- *
- * @param pw        Pointer to buffer containing to which password 
- *                  copied
- * 
- * @param pwlen     The size of the password buffer in bytes
- *           
- */
-typedef void (*smbc_get_auth_data_fn)(const char *srv, 
-                                      const char *shr,
-                                      char *wg, int wglen, 
-                                      char *un, int unlen,
-                                      char *pw, int pwlen);
-
-
-/**@ingroup structure
- * Print job info callback function type.
- *
- * @param i         pointer to print job information structure
- *
- */ 
-typedef void (*smbc_get_print_job_info)(struct print_job_info *i);
-
-
-/**@ingroup misc
- * Initialize the samba client library.
- *
- * Must be called before using any of the smbclient API function
- *  
- * @param fn        The function that will be called to obtaion 
- *                  authentication credentials.
- *
- * @param debug     Allows caller to set the debug level. Can be
- *                  changed in smb.conf file. Allows caller to set
- *                  debugging if no smb.conf.
- *   
- * @return          0 on success, < 0 on error with errno set:
- *                  - ENOMEM Out of memory
- *                  - ENOENT The smb.conf file would not load
- *
- */
-int smbc_init(smbc_get_auth_data_fn fn, int debug);
-
-
-/**@ingroup file
- * Open a file on an SMB server.
- *
- * @param furl      The smb url of the file to be opened. 
- *
- * @param flags     Is one of O_RDONLY, O_WRONLY or O_RDWR which 
- *                  request opening  the  file  read-only,write-only
- *                  or read/write. flags may also be bitwise-or'd with
- *                  one or  more of  the following: 
- *                  O_CREAT - If the file does not exist it will be 
- *                  created.
- *                  O_EXCL - When  used with O_CREAT, if the file 
- *                  already exists it is an error and the open will 
- *                  fail. 
- *                  O_TRUNC - If the file already exists it will be
- *                  truncated.
- *                  O_APPEND The  file  is  opened  in  append mode 
- *
- * @param mode      mode specifies the permissions to use if a new 
- *                  file is created.  It  is  modified  by  the 
- *                  process's umask in the usual way: the permissions
- *                  of the created file are (mode & ~umask) 
- *
- *                  Not currently use, but there for future use.
- *                  We will map this to SYSTEM, HIDDEN, etc bits
- *                  that reverses the mapping that smbc_fstat does.
- *
- * @return          Valid file handle, < 0 on error with errno set:
- *                  - ENOMEM  Out of memory
- *                  - EINVAL if an invalid parameter passed, like no 
- *                  file.
- *                  - EEXIST  pathname already exists and O_CREAT and 
- *                  O_EXCL were used.
- *                  - EISDIR  pathname  refers  to  a  directory  and  
- *                  the access requested involved writing.
- *                  - EACCES  The requested access to the file is not 
- *                  allowed 
- *                  - ENODEV The requested share does not exist
- *                  - ENOTDIR A file on the path is not a directory
- *                  - ENOENT  A directory component in pathname does 
- *                  not exist.
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_creat()
- *
- * @note            This call uses an underlying routine that may create
- *                  a new connection to the server specified in the URL.
- *                  If the credentials supplied in the URL, or via the
- *                  auth_fn in the smbc_init call, fail, this call will
- *                  try again with an empty username and password. This 
- *                  often gets mapped to the guest account on some machines.
-*/
-int smbc_open(const char *furl, int flags, mode_t mode);
-
-
-/**@ingroup file
- * Create a file on an SMB server.
- *
- * Same as calling smbc_open() with flags = O_CREAT|O_WRONLY|O_TRUNC 
- *   
- * @param furl      The smb url of the file to be created
- *  
- * @param mode      mode specifies the permissions to use if  a  new  
- *                  file is created.  It  is  modified  by  the 
- *                  process's umask in the usual way: the permissions
- *                  of the created file are (mode & ~umask)
- *
- *                  NOTE, the above is not true. We are dealing with 
- *                  an SMB server, which has no concept of a umask!
- *      
- * @return          Valid file handle, < 0 on error with errno set:
- *                  - ENOMEM  Out of memory
- *                  - EINVAL if an invalid parameter passed, like no 
- *                  file.
- *                  - EEXIST  pathname already exists and O_CREAT and
- *                  O_EXCL were used.
- *                  - EISDIR  pathname  refers  to  a  directory  and
- *                  the access requested involved writing.
- *                  - EACCES  The requested access to the file is not
- *                  allowed 
- *                  - ENOENT  A directory component in pathname does 
- *                  not exist.
- *                  - ENODEV The requested share does not exist.
- *                  - EUCLEAN smbc_init() failed or has not been called
- * @see             smbc_open()
- *
-*/
-int smbc_creat(const char *furl, mode_t mode);
-
-
-/**@ingroup file
- * Read from a file using an opened file handle.
- *
- * @param fd        Open file handle from smbc_open() or smbc_creat()
- *
- * @param buf       Pointer to buffer to recieve read data
- *
- * @param bufsize   Size of buf in bytes
- *
- * @return          Number of bytes read, < 0 on error with errno set:
- *                  - EISDIR fd refers to a directory
- *                  - EBADF  fd  is  not  a valid file descriptor or 
- *                  is not open for reading.
- *                  - EINVAL fd is attached to an object which is 
- *                  unsuitable for reading, or no buffer passed.
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_open(), smbc_write()
- *
- */
-ssize_t smbc_read(int fd, void *buf, size_t bufsize);
-
-
-/**@ingroup file
- * Write to a file using an opened file handle.
- *
- * @param fd        Open file handle from smbc_open() or smbc_creat()
- *
- * @param buf       Pointer to buffer to recieve read data
- *
- * @param bufsize   Size of buf in bytes
- *
- * @return          Number of bytes written, < 0 on error with errno set:
- *                  - EISDIR fd refers to a directory.
- *                  - EBADF  fd  is  not  a valid file descriptor or 
- *                  is not open for reading.
- *                  - EINVAL fd is attached to an object which is 
- *                  unsuitable for reading, or no buffer passed.
- *                  - EUCLEAN smbc_init() failed or has not been called
- * @see             smbc_open(), smbc_read()
- *
- */
-ssize_t smbc_write(int fd, void *buf, size_t bufsize);
-
-
-/**@ingroup file
- * Seek to a specific location in a file.
- *
- * @param fd        Open file handle from smbc_open() or smbc_creat()
- * 
- * @param offset    Offset in bytes from whence
- * 
- * @param whence    A location in the file:
- *                  - SEEK_SET The offset is set to offset bytes from
- *                  the beginning of the file
- *                  - SEEK_CUR The offset is set to current location 
- *                  plus offset bytes.
- *                  - SEEK_END The offset is set to the size of the 
- *                  file plus offset bytes.
- *
- * @return          Upon successful completion, lseek returns the 
- *                  resulting offset location as measured in bytes 
- *                  from the beginning  of the file. Otherwise, a value
- *                  of (off_t)-1 is returned and errno is set to 
- *                  indicate the error:
- *                  - EBADF  Fildes is not an open file descriptor.
- *                  - EINVAL Whence is not a proper value.  
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @todo Are all the whence values really supported?
- * 
- * @todo Are errno values complete and correct?
-*/
-off_t smbc_lseek(int fd, off_t offset, int whence);
-
-
-/**@ingroup file
- * Close an open file handle.
- *
- * @param fd        The file handle to close
- *
- * @return          0 on success, < 0 on error with errno set:
- *                  - EBADF  fd isn't a valid open file descriptor
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_open(), smbc_creat()
-*/
-int smbc_close(int fd);
-
-
-/**@ingroup directory
- * Unlink (delete) a file or directory.
- *
- * @param furl      The smb url of the file to delete
- *
- * @return          0 on success, < 0 on error with errno set:
- *                  - EACCES or EPERM Write  access  to the directory 
- *                  containing pathname is not allowed or one  
- *                  of  the  directories in pathname did not allow
- *                  search (execute) permission
- *                  - ENOENT A directory component in pathname does
- *                  not exist
- *                  - EINVAL NULL was passed in the file param
- *                  - EACCES You do not have access to the file
- *                  - ENOMEM Insufficient kernel memory was available
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_rmdir()s
- *
- * @todo Are errno values complete and correct?
-*/
-int smbc_unlink(const char *furl);
-
-
-/**@ingroup directory
- * Rename or move a file or directory.
- * 
- * @param ourl      The original smb url (source url) of file or 
- *                  directory to be moved
- * 
- * @param nurl      The new smb url (destination url) of the file
- *                  or directory after the move.  Currently nurl must
- *                  be on the same share as ourl.
- *
- * @return          0 on success, < 0 on error with errno set:
- *                  - EISDIR nurl is an existing directory, but ourl is
- *                  not a directory.
- *                  - EEXIST nurl is  a  non-empty directory, 
- *                  i.e., contains entries other than "." and ".."
- *                  - EINVAL The  new  url  contained  a path prefix 
- *                  of the old, or, more generally, an  attempt was
- *                  made  to make a directory a subdirectory of itself.
- *                  - ENOTDIR A component used as a directory in ourl 
- *                  or nurl path is not, in fact, a directory.  Or, 
- *                  ourl  is a directory, and newpath exists but is not
- *                  a directory.
- *                  - EACCES or EPERM Write access to the directory 
- *                  containing ourl or nurl is not allowed for the 
- *                  process's effective uid,  or  one of the 
- *                  directories in ourl or nurl did not allow search
- *                  (execute) permission,  or ourl  was  a  directory
- *                  and did not allow write permission.
- *                  - ENOENT A  directory component in ourl or nurl 
- *                  does not exist.
- *                  - EXDEV Rename across shares not supported.
- *                  - ENOMEM Insufficient kernel memory was available.
- *                  - EUCLEAN smbc_init() failed or has not been called
- *                  - EEXIST The target file, nurl, already exists.
- *
- *
- * @todo Are we going to support copying when urls are not on the same
- *       share?  I say no... NOTE. I agree for the moment.
- *
-*/
-int smbc_rename(const char *ourl, const char *nurl);
-
-
-/**@ingroup directory
- * Open a directory used to obtain directory entries.
- *
- * @param durl      The smb url of the directory to open
- *
- * @return          Valid directory handle. < 0 on error with errno set:
- *                  - EACCES Permission denied.
- *                  - EINVAL A NULL file/URL was passed, or the URL would
- *                  not parse, or was of incorrect form.
- *                  - ENOENT durl does not exist, or name is an 
- *                  - ENOMEM Insufficient memory to complete the 
- *                  operation.                              
- *                  - ENOTDIR name is not a directory.
- *                  - EPERM the workgroup could not be found.
- *                  - ENODEV the workgroup or server could not be found.
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_getdents(), smbc_readdir(), smbc_closedir()
- *
-*/
-int smbc_opendir(const char *durl);
-
-
-/**@ingroup directory
- * Close a directory handle opened by smbc_opendir().
- *
- * @param dh        Directory handle to close
- *
- * @return          0 on success, < 0 on error with errno set:
- *                  - EBADF dh is an invalid directory handle
- *
- * @see             smbc_opendir()
-*/
-int smbc_closedir(int dh);
-
-
-/**@ingroup directory
- * Get multiple directory entries.
- *
- * smbc_getdents() reads as many dirent structures from the an open 
- * directory handle into a specified memory area as will fit.
- *
- * @param dh        Valid directory as returned by smbc_opendir()
- *
- * @param dirp      pointer to buffer that will receive the directory
- *                  entries.
- * 
- * @param count     The size of the dirp buffer in bytes
- *
- * @returns         If any dirents returned, return will indicate the
- *                  total size. If there were no more dirents available,
- *                  0 is returned. < 0 indicates an error.
- *                  - EBADF  Invalid directory handle
- *                  - EINVAL Result buffer is too small
- *                  - ENOENT No such directory.
- *                  - EUCLEAN smbc_init() failed or has not been called
- * @see             , smbc_dirent, smbc_readdir(), smbc_open()
- *
- * @todo Are errno values complete and correct?
- *
- * @todo Add example code so people know how to parse buffers.
- */
-int smbc_getdents(unsigned int dh, struct smbc_dirent *dirp, int count);
-
-
-/**@ingroup directory
- * Get a single directory entry.
- *
- * @param dh        Valid directory as returned by smbc_opendir()
- *
- * @return          A pointer to a smbc_dirent structure, or NULL if an
- *                  error occurs or end-of-directory is reached:
- *                  - EBADF Invalid directory handle
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_dirent, smbc_getdents(), smbc_open()
-*/
-struct smbc_dirent* smbc_readdir(unsigned int dh);
-
-
-/**@ingroup directory
- * Get the current directory offset.
- *
- * smbc_telldir() may be used in conjunction with smbc_readdir() and
- * smbc_lseekdir().
- *
- * @param dh        Valid directory as returned by smbc_opendir()
- *
- * @return          The current location in the directory stream or -1
- *                  if an error occur.  The current location is not
- *                  an offset. Becuase of the implementation, it is a 
- *                  handle that allows the library to find the entry
- *                  later.
- *                  - EBADF dh is not a valid directory handle
- *                  - EUCLEAN smbc_init() failed or has not been called
- *                  - ENOTDIR if dh is not a directory
- *
- * @see             smbc_readdir()
- *
-*/
-off_t smbc_telldir(int dh);
-
-
-/**@ingroup directory
- * lseek on directories.
- *
- * smbc_lseekdir() may be used in conjunction with smbc_readdir() and
- * smbc_telldir(). (rewind by smbc_lseekdir(fd, NULL))
- *
- * @param fd        Valid directory as returned by smbc_opendir()
- * 
- * @param offset    The offset (as returned by smbc_telldir). Can be
- *                  NULL, in which case we will rewind
- *
- * @return          0 on success, -1 on failure
- *                  - EUCLEAN smbc_init() failed or has not been called
- *                  - EBADF dh is not a valid directory handle
- *                  - ENOTDIR if dh is not a directory
- *                  - EINVAL offset did not refer to a valid dirent
- *
- * @see             smbc_telldir()
- *
- *
- * @todo In what does the reture and errno values mean?
- */
-int smbc_lseekdir(int fd, off_t offset);
-
-/**@ingroup directory
- * Create a directory.
- *
- * @param durl      The url of the directory to create
- *
- * @param mode      Specifies  the  permissions to use. It is modified
- *                  by the process's umask in the usual way: the 
- *                  permissions of the created file are (mode & ~umask).
- * 
- * @return          0 on success, < 0 on error with errno set:
- *                  - EEXIST directory url already exists
- *                  - EACCES The parent directory does not allow write
- *                  permission to the process, or one of the directories
- *                  - ENOENT A directory component in pathname does not
- *                  exist.
- *                  - EINVAL NULL durl passed.
- *                  - ENOMEM Insufficient memory was available.
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_rmdir()
- *
-*/
-int smbc_mkdir(const char *durl, mode_t mode);
-
-
-/**@ingroup directory
- * Remove a directory.
- * 
- * @param durl      The smb url of the directory to remove
- *
- * @return          0 on success, < 0 on error with errno set:
- *                  - EACCES or EPERM Write access to the directory
- *                  containing pathname was not allowed.
- *                  - EINVAL durl is NULL.
- *                  - ENOENT A directory component in pathname does not
- *                  exist.
- *                  - ENOTEMPTY directory contains entries.
- *                  - ENOMEM Insufficient kernel memory was available.
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_mkdir(), smbc_unlink() 
- *
- * @todo Are errno values complete and correct?
- */
-int smbc_rmdir(const char *durl);
-
-
-/**@ingroup attribute
- * Get information about a file or directory.
- *
- * @param url       The smb url to get information for
- *
- * @param st        pointer to a buffer that will be filled with 
- *                  standard Unix struct stat information.
- *
- * @return          0 on success, < 0 on error with errno set:
- *                  - ENOENT A component of the path file_name does not
- *                  exist.
- *                  - EINVAL a NULL url was passed.
- *                  - EACCES Permission denied.
- *                  - ENOMEM Out of memory
- *                  - ENOTDIR The target dir, url, is not a directory.
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             Unix stat()
- *
- */
-int smbc_stat(const char *url, struct stat *st);
-
-
-/**@ingroup attribute
- * Get file information via an file descriptor.
- * 
- * @param fd        Open file handle from smbc_open() or smbc_creat()
- *
- * @param st        pointer to a buffer that will be filled with 
- *                  standard Unix struct stat information.
- * 
- * @return          EBADF  filedes is bad.
- *                  - EACCES Permission denied.
- *                  - EBADF fd is not a valid file descriptor
- *                  - EINVAL Problems occurred in the underlying routines.
- *                  - ENOMEM Out of memory
- *                  - EUCLEAN smbc_init() failed or has not been called
- *
- * @see             smbc_stat(), Unix stat()
- *
- */
-int smbc_fstat(int fd, struct stat *st);
-
-
-/**@ingroup attribue
- * Change the ownership of a file or directory.
- *
- * @param url       The smb url of the file or directory to change 
- *                  ownership of.
- *
- * @param owner     I have no idea?
- *
- * @param group     I have not idea?
- *
- * @return          0 on success, < 0 on error with errno set:
- *                  - EPERM  The effective UID does not match the owner
- *                  of the file, and is not zero; or the owner or group
- *                  were specified incorrectly.
- *                  - ENOENT The file does not exist.
- *                  - ENOMEM Insufficient was available.
- *                  - ENOENT file or directory does not exist
- *
- * @todo Are we actually going to be able to implement this function
- *
- * @todo How do we abstract owner and group uid and gid?
- *
- */
-int smbc_chown(const char *url, uid_t owner, gid_t group);
-
-
-/**@ingroup attribute
- * Change the permissions of a file.
- *
- * @param url       The smb url of the file or directory to change
- *                  permissions of
- * 
- * @param mode      The permissions to set:
- *                  - Put good explaination of permissions here!
- *
- * @return          0 on success, < 0 on error with errno set:
- *                  - EPERM  The effective UID does not match the owner
- *                  of the file, and is not zero
- *                  - ENOENT The file does not exist.
- *                  - ENOMEM Insufficient was available.
- *                  - ENOENT file or directory does not exist
- *
- * @todo Actually implement this fuction?
- *
- * @todo Are errno values complete and correct?
- */
-int smbc_chmod(const char *url, mode_t mode);
-
-
-/**@ingroup print
- * Print a file given the name in fname. It would be a URL ...
- * 
- * @param fname     The URL of a file on a remote SMB server that the
- *                  caller wants printed
- *
- * @param printq    The URL of the print share to print the file to.
- *
- * @return          0 on success, < 0 on error with errno set:         
- *
- *                  - EUCLEAN smbc_init() failed or has not been called
- *                  - EINVAL fname or printq was NULL
- *                  and errors returned by smbc_open
- *
-*/                                     
-int smbc_print_file(const char *fname, const char *printq);
-
-/**@ingroup print
- * Open a print file that can be written to by other calls. This simply
- * does an smbc_open call after checking if there is a file name on the
- * URI. If not, a temporary name is added ...
- *
- * @param fname     The URL of the print share to print to?
- *
- * @returns         A file handle for the print file if successful.
- *                  Returns -1 if an error ocurred and errno has the values
- *                  - EUCLEAN smbc_init() failed or has not been called
- *                  - EINVAL fname was NULL
- *                  - all errors returned by smbc_open
- *
- */
-int smbc_open_print_job(const char *fname);
-
-/**@ingroup print
- * List the print jobs on a print share, for the moment, pass a callback 
- *
- * @param purl      The url of the print share to list the jobs of
- * 
- * @param fn        Callback function the receives printjob info
- * 
- * @return          0 on success, < 0 on error with errno set: 
- *                  - EUCLEAN smbc_init() failed or has not been called
- *                  - EINVAL fname was NULL
- *                  - EACCES ???
- */
-int smbc_list_print_jobs(const char *purl, smbc_get_print_job_info fn);
-
-/**@ingroup print
- * Delete a print job 
- *
- * @param purl      Url of the print share
- *
- * @param id        The id of the job to delete
- *
- * @return          0 on success, < 0 on error with errno set: 
- *                  - EUCLEAN smbc_init() failed or has not been called
- *                  - EINVAL fname was NULL
- *
- * @todo    what errno values are possible here?
- */
-int smbc_unlink_print_job(const char *purl, int id);
-
-
-#endif /* SMBCLIENT_H_INCLUDED */
diff --git a/source/libsmb/clidgram.c b/source/libsmb/clidgram.c
deleted file mode 100644
index 3eaf2bf48af..00000000000
--- a/source/libsmb/clidgram.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   client dgram calls
-   Copyright (C) Andrew Tridgell 1994-1998
-   Copyright (C) Richard Sharpe 2001
-   Copyright (C) John Terpstra 2001
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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.
-*/
-
-#define NO_SYSLOG
-
-#include "includes.h"
-
-/*
- * cli_send_mailslot, send a mailslot for client code ...
- */
-
-int cli_send_mailslot(int dgram_sock, BOOL unique, char *mailslot, 
-		      char *buf, int len,
-		      const char *srcname, int src_type, 
-		      const char *dstname, int dest_type,
-		      struct in_addr dest_ip, struct in_addr src_ip,
-		      int dest_port, int src_port)
-{
-  struct packet_struct p;
-  struct dgram_packet *dgram = &p.packet.dgram;
-  char *ptr, *p2;
-  char tmp[4];
-
-  bzero((char *)&p, sizeof(p));
-
-  /*
-   * Next, build the DGRAM ...
-   */
-
-  /* DIRECT GROUP or UNIQUE datagram. */
-  dgram->header.msg_type = unique ? 0x10 : 0x11; 
-  dgram->header.flags.node_type = M_NODE;
-  dgram->header.flags.first = True;
-  dgram->header.flags.more = False;
-  dgram->header.dgm_id = ((unsigned)time(NULL)%(unsigned)0x7FFF) + ((unsigned)sys_getpid()%(unsigned)100);
-  dgram->header.source_ip.s_addr = src_ip.s_addr;
-  /*fprintf(stderr, "Source IP = %0X\n", dgram->header.source_ip); */
-  dgram->header.source_port = ntohs(src_port);
-  fprintf(stderr, "Source Port = %0X\n", dgram->header.source_port);
-  dgram->header.dgm_length = 0; /* Let build_dgram() handle this. */
-  dgram->header.packet_offset = 0;
-  
-  make_nmb_name(&dgram->source_name,srcname,src_type);
-  make_nmb_name(&dgram->dest_name,dstname,dest_type);
-
-  ptr = &dgram->data[0];
-
-  /* Setup the smb part. */
-  ptr -= 4; /* XXX Ugliness because of handling of tcp SMB length. */
-  memcpy(tmp,ptr,4);
-  set_message(ptr,17,17 + len,True);
-  memcpy(ptr,tmp,4);
-
-  CVAL(ptr,smb_com) = SMBtrans;
-  SSVAL(ptr,smb_vwv1,len);
-  SSVAL(ptr,smb_vwv11,len);
-  SSVAL(ptr,smb_vwv12,70 + strlen(mailslot));
-  SSVAL(ptr,smb_vwv13,3);
-  SSVAL(ptr,smb_vwv14,1);
-  SSVAL(ptr,smb_vwv15,1);
-  SSVAL(ptr,smb_vwv16,2);
-  p2 = smb_buf(ptr);
-  pstrcpy(p2,mailslot);
-  p2 = skip_string(p2,1);
-
-  memcpy(p2,buf,len);
-  p2 += len;
-
-  dgram->datasize = PTR_DIFF(p2,ptr+4); /* +4 for tcp length. */
-
-  p.ip = dest_ip;
-  p.port = dest_port;
-  p.fd = dgram_sock;
-  p.timestamp = time(NULL);
-  p.packet_type = DGRAM_PACKET;
-
-  DEBUG(4,("send_mailslot: Sending to mailslot %s from %s IP %s ", mailslot,
-                    nmb_namestr(&dgram->source_name), inet_ntoa(src_ip)));
-  DEBUG(4,("to %s IP %s\n", nmb_namestr(&dgram->dest_name), inet_ntoa(dest_ip)));
-
-  return send_packet(&p);
-
-}
-
-/*
- * cli_get_response: Get a response ...
- */
-int cli_get_response(int dgram_sock, BOOL unique, char *mailslot, char *buf, int bufsiz)
-{
-  struct packet_struct *packet;
-
-  packet = receive_dgram_packet(dgram_sock, 5, mailslot);
-
-  if (packet) { /* We got one, pull what we want out of the SMB data ... */
-
-    struct dgram_packet *dgram = &packet->packet.dgram;
-
-    /*
-     * We should probably parse the SMB, but for now, we will pull what
-     * from fixed, known locations ...
-     */
-
-    /* Copy the data to buffer, respecting sizes ... */
-
-    bcopy(&dgram->data[92], buf, MIN(bufsiz, (dgram->datasize - 92)));
-
-  }
-  else 
-    return -1;
-
-  return 0;
-
-}
-
-/*
- * cli_get_backup_list: Send a get backup list request ...
- */
-
-static char cli_backup_list[1024];
-
-int cli_get_backup_list(const char *myname, const char *send_to_name)
-{
-  char outbuf[15];
-  char *p;
-  struct in_addr sendto_ip, my_ip;
-  int dgram_sock;
-  struct sockaddr_in sock_out;
-  int name_size;
-
-  if (!resolve_name(send_to_name, &sendto_ip, 0x1d)) {
-
-    DEBUG(0, ("Could not resolve name: %s<1D>\n", send_to_name));
-    return False;
-
-  }
-
-  my_ip.s_addr = inet_addr("0.0.0.0");
- 
-  if (!resolve_name(myname, &my_ip, 0x00)) { /* FIXME: Call others here */
-
-    DEBUG(0, ("Could not resolve name: %s<00>\n", myname));
-
-  }
-
-  if ((dgram_sock = open_socket_out(SOCK_DGRAM, &sendto_ip, 138, LONG_CONNECT_TIMEOUT)) < 0) {
-
-    DEBUG(4, ("open_sock_out failed ..."));
-    return False;
-
-  }
-
-  /* Make it a broadcast socket ... */
-
-  set_socket_options(dgram_sock, "SO_BROADCAST");
-
-  /* Make it non-blocking??? */
-
-  if (fcntl(dgram_sock, F_SETFL, O_NONBLOCK) < 0) {
-
-    DEBUG(0, ("Unable to set non blocking on dgram sock\n"));
-
-  }
-
-  /* Now, bind a local addr to it ... Try port 138 first ... */
-
-  bzero((char *)&sock_out, sizeof(sock_out));
-  sock_out.sin_addr.s_addr = INADDR_ANY;
-  sock_out.sin_port = htons(138);
-  sock_out.sin_family = AF_INET;
-
-  if (bind(dgram_sock, (struct sockaddr_in *)&sock_out, sizeof(sock_out)) < 0) {
-
-    /* Try again on any port ... */
-
-    sock_out.sin_port = INADDR_ANY;
-
-    if (bind(dgram_sock, (struct sockaddr_in *)&sock_out, sizeof(sock_out)) < 0) {
-
-      DEBUG(4, ("failed to bind socket to address ...\n"));
-      return False;
-	
-    }
-
-  }
-
-  /* Now, figure out what socket name we were bound to. We want the port */
-
-  name_size = sizeof(sock_out);
-
-  getsockname(dgram_sock, (struct sockaddr_in *)&sock_out, &name_size);
-
-  DEBUG(5, ("Socket bound to IP:%s, port: %d\n", inet_ntoa(sock_out.sin_addr), ntohs(sock_out.sin_port)));
-
-  /* Now, build the request */
-
-  bzero(cli_backup_list, sizeof(cli_backup_list));
-  bzero(outbuf, sizeof(outbuf));
-
-  p = outbuf;
-
-  SCVAL(p, 0, ANN_GetBackupListReq);
-  p++;
-
-  SCVAL(p, 0, 1); /* Count pointer ... */
-  p++;
-
-  SIVAL(p, 0, 1); /* The sender's token ... */
-  p += 4;
-
-  cli_send_mailslot(dgram_sock, True, "\\MAILSLOT\\BROWSE", outbuf, 
-		    PTR_DIFF(p, outbuf), myname, 0, send_to_name, 
-		    0x1d, sendto_ip, my_ip, 138, sock_out.sin_port);
-
-  /* We should check the error and return if we got one */
-
-  /* Now, get the response ... */
-
-  cli_get_response(dgram_sock, True, "\\MAILSLOT\\BROWSE", cli_backup_list, sizeof(cli_backup_list));
-
-  /* Should check the response here ... FIXME */
-
-  close(dgram_sock);
-
-  return True;
-
-}
-
-/*
- * cli_get_backup_server: Get the backup list and retrieve a server from it
- */
-
-int cli_get_backup_server(char *my_name, char *target, char *servername, int namesize)
-{
-
-  /* Get the backup list first. We could pull this from the cache later */
-
-  cli_get_backup_list(my_name, target);  /* FIXME: Check the response */
-
-  if (!cli_backup_list[0]) { /* Empty list ... try again */
-
-    cli_get_backup_list(my_name, target);
-
-  }
-
-  strncpy(servername, cli_backup_list, MIN(16, namesize));
-
-  return True;
-
-}
-
-
-
diff --git a/source/libsmb/clistr.c b/source/libsmb/clistr.c
deleted file mode 100644
index 13bf1f05b7a..00000000000
--- a/source/libsmb/clistr.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   client string routines
-   Copyright (C) Andrew Tridgell 2001
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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.
-*/
-
-#define NO_SYSLOG
-
-#include "includes.h"
-
-/****************************************************************************
-copy a string from a char* src to a unicode or ascii
-dos code page destination choosing unicode or ascii based on the 
-cli->capabilities flag
-return the number of bytes occupied by the string in the destination
-flags can have:
-  STR_TERMINATE means include the null termination
-  STR_CONVERT   means convert from unix to dos codepage
-  STR_UPPER     means uppercase in the destination
-  STR_ASCII     use ascii even with unicode servers
-dest_len is the maximum length allowed in the destination. If dest_len
-is -1 then no maxiumum is used
-****************************************************************************/
-int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len, int flags)
-{
-	int len=0;
-
-	/* treat a pstring as "unlimited" length */
-	if (dest_len == -1) {
-		dest_len = sizeof(pstring);
-	}
-
-	if (!(flags & STR_ASCII) && clistr_align(cli->outbuf, dest)) {
-		*(char *)dest = 0;
-		dest = (void *)((char *)dest + 1);
-		dest_len--;
-		len++;
-	}
-
-	if ((flags & STR_ASCII) || !(SVAL(cli->outbuf, smb_flg2) & FLAGS2_UNICODE_STRINGS)) {
-		/* the server doesn't want unicode */
-		safe_strcpy(dest, src, dest_len);
-		len = strlen(dest);
-		if (flags & STR_TERMINATE) len++;
-		if (flags & STR_CONVERT) unix_to_dos(dest,True);
-		if (flags & STR_UPPER) strupper(dest);
-		return len;
-	}
-
-	/* the server likes unicode. give it the works */
-	if (flags & STR_CONVERT) {
-		dos_PutUniCode(dest, src, dest_len, flags & STR_TERMINATE);
-	} else {
-		ascii_to_unistr(dest, src, dest_len);
-	}
-	if (flags & STR_UPPER) {
-		strupper_w(dest);
-	}
-	len += strlen(src)*2;
-	if (flags & STR_TERMINATE) len += 2;
-	return len;
-}
-
-/****************************************************************************
-copy a string from a unicode or ascii source (depending on
-cli->capabilities) to a char* destination
-flags can have:
-  STR_CONVERT   means convert from dos to unix codepage
-  STR_TERMINATE means the string in src is null terminated
-  STR_UNICODE   means to force as unicode
-if STR_TERMINATE is set then src_len is ignored
-src_len is the length of the source area in bytes
-return the number of bytes occupied by the string in src
-****************************************************************************/
-int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len, int src_len, int flags)
-{
-	int len;
-
-	if (dest_len == -1) {
-		dest_len = sizeof(pstring);
-	}
-
-	if (!(flags & STR_ASCII) && clistr_align(cli->inbuf, src)) {
-		src = (void *)((char *)src + 1);
-		if (src_len > 0) src_len--;
-	}
-
-	if ((flags & STR_ASCII) ||
-	    (!(flags & STR_UNICODE) && !(SVAL(cli->inbuf, smb_flg2) & FLAGS2_UNICODE_STRINGS))) {
-		/* the server doesn't want unicode */
-		if (flags & STR_TERMINATE) {
-			safe_strcpy(dest, src, dest_len);
-			len = strlen(src)+1;
-		} else {
-			if (src_len > dest_len) src_len = dest_len;
-			len = src_len;
-			memcpy(dest, src, len);
-			dest[len] = 0;
-		}
-		if (flags & STR_CONVERT) dos_to_unix(dest,True);
-		return len;
-	}
-
-	if (flags & STR_TERMINATE) {
-		unistr_to_ascii(dest, src, dest_len);
-		len = strlen(dest)*2 + 2;
-	} else {
-		int i, c;
-		if (dest_len*2 < src_len) src_len = 2*dest_len;
-		for (i=0; i < src_len; i += 2) {
-			c = SVAL(src, i);
-			*dest++ = c;
-		}
-		*dest++ = 0;
-		len = src_len;
-	}
-	if (flags & STR_CONVERT) dos_to_unix(dest,True);
-	return len;
-}
-
-
-/****************************************************************************
-return an alignment of either 0 or 1
-if unicode is not negotiated then return 0
-otherwise return 1 if offset is off
-****************************************************************************/
-int clistr_align(const void *buf, const void *p)
-{
-	if (!(SVAL(buf, smb_flg2) & FLAGS2_UNICODE_STRINGS)) return 0;
-	return PTR_DIFF(p, buf) & 1;
-}